@koala123/aoi-db 1.0.11 → 2.0.1

package/dist/app.controller.d.ts

@@ -1,5 +1,5 @@
 import { AppService } from './app.service';
-import { DBDto, FeatureDto, FeatureRes, InsertToDBDto, DeleteFromDBDto, EraseByTypeDto, UpdateDBDto, QueryDto, QueryRes, FeatureExtractDto, FeatureExtractRes, CoreLearnDto, CropSamplesDto, EraseSamplesDto, UpdateSamplesDto, InsertSamplesDto } from './app.dto';
+import { DBDto, DeleteDBDto, FeatureDto, FeatureRes, InsertToDBDto, DeleteFromDBDto, EraseByTypeDto, UpdateDBDto, QueryDto, QueryRes, FeatureExtractDto, FeatureExtractRes, CoreLearnDto, CropSamplesDto, ReCoreLearnDto, MergeDBDto, EraseSamplesDto, UpdateSamplesDto, InsertSamplesDto } from './app.dto';
 export declare class AppController {
     private readonly appService;
     constructor(appService: AppService);
@@ -8,7 +8,7 @@ export declare class AppController {
     exportDB(db: string): Promise<FeatureDto[]>;
     load(db: string): Promise<number>;
     release(db: string): Promise<boolean>;
-    delete(db: string): Promise<boolean>;
+    delete(body: DeleteDBDto): Promise<boolean>;
     insert(body: InsertToDBDto): Promise<number>;
     eraseByIds(body: DeleteFromDBDto): Promise<number>;
     eraseByType(body: EraseByTypeDto): Promise<number>;
@@ -16,6 +16,8 @@ export declare class AppController {
     query(body: QueryDto): Promise<QueryRes>;
     featureExtract(body: FeatureExtractDto): Promise<FeatureExtractRes>;
     coreLearn(body: CoreLearnDto): Promise<FeatureRes[]>;
+    refreshCoreLearn(body: ReCoreLearnDto): Promise<number>;
+    mergeMDbNgFeature(body: MergeDBDto): Promise<number>;
     cropSamplesBySrc(body: CropSamplesDto): Promise<boolean>;
     eraseSamples(body: EraseSamplesDto): Promise<number>;
     updateSamples(body: UpdateSamplesDto): Promise<number>;

package/dist/app.controller.js

@@ -37,8 +37,8 @@ let AppController = class AppController {
     release(db) {
         return this.appService.release(db);
     }
-    delete(db) {
-        return this.appService.delete(db);
+    delete(body) {
+        return this.appService.delete(body.db, body.deleteSamples);
     }
     insert(body) {
         return this.appService.insert(body.db, body.data);
@@ -61,6 +61,12 @@ let AppController = class AppController {
     async coreLearn(body) {
         return await this.appService.coreLearn(body);
     }
+    async refreshCoreLearn(body) {
+        return await this.appService.refreshCoreLearn(body);
+    }
+    async mergeMDbNgFeature(body) {
+        return await this.appService.mergeMDbNgFeature(body);
+    }
     async cropSamplesBySrc(body) {
         return await this.appService.cropSamplesBySrc(body);
     }
@@ -132,12 +138,12 @@ __decorate([
 __decorate([
     (0, common_1.Post)('delete'),
     (0, swagger_1.ApiOperation)({ summary: '删除db文件，若此db文件已被加载到内存中，此接口会先释放再删除' }),
-    (0, swagger_1.ApiBody)({ type: app_dto_1.DBDto }),
+    (0, swagger_1.ApiBody)({ type: app_dto_1.DeleteDBDto }),
     (0, swagger_1.ApiResponse)({ type: Boolean, status: 201, description: '此操作是否成功' }),
     openapi.ApiResponse({ status: 201, type: Boolean }),
-    __param(0, (0, common_1.Body)('db')),
+    __param(0, (0, common_1.Body)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
+    __metadata("design:paramtypes", [app_dto_1.DeleteDBDto]),
     __metadata("design:returntype", Promise)
 ], AppController.prototype, "delete", null);
 __decorate([
@@ -220,6 +226,28 @@ __decorate([
     __metadata("design:paramtypes", [app_dto_1.CoreLearnDto]),
     __metadata("design:returntype", Promise)
 ], AppController.prototype, "coreLearn", null);
+__decorate([
+    (0, common_1.Post)("refreshCoreLearn"),
+    (0, swagger_1.ApiOperation)({ summary: "提取当前db中的NG特征以及OK特征，以NG特征为基础，重新将ok特征进行好品建模" }),
+    (0, swagger_1.ApiBody)({ type: app_dto_1.ReCoreLearnDto }),
+    (0, swagger_1.ApiResponse)({ type: Number, status: 201, description: 'db的条目总数' }),
+    openapi.ApiResponse({ status: 201, type: Number }),
+    __param(0, (0, common_1.Body)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [app_dto_1.ReCoreLearnDto]),
+    __metadata("design:returntype", Promise)
+], AppController.prototype, "refreshCoreLearn", null);
+__decorate([
+    (0, common_1.Post)("mergeMDbNgFeature"),
+    (0, swagger_1.ApiOperation)({ summary: "传递多个baseDB, 提取其中的NG特征为一个db" }),
+    (0, swagger_1.ApiBody)({ type: app_dto_1.MergeDBDto }),
+    (0, swagger_1.ApiResponse)({ type: Number, status: 201, description: 'db的条目总数' }),
+    openapi.ApiResponse({ status: 201, type: Number }),
+    __param(0, (0, common_1.Body)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [app_dto_1.MergeDBDto]),
+    __metadata("design:returntype", Promise)
+], AppController.prototype, "mergeMDbNgFeature", null);
 __decorate([
     (0, common_1.Post)("cropSamplesBySrc"),
     (0, swagger_1.ApiOperation)({ summary: "裁剪sample小图" }),

package/dist/app.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../src/app.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../src/app.controller.ts"],"names":[],"mappings":"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"}

package/dist/app.dto.d.ts

@@ -1,6 +1,9 @@
 export declare class DBDto {
     db: string;
 }
+export declare class DeleteDBDto extends DBDto {
+    deleteSamples?: boolean;
+}
 export declare class IdTypeDto {
     id: number;
     type: number;
@@ -52,10 +55,23 @@ export declare class CoreLearnDto extends ImageDto {
     learnUntilNone?: boolean;
     featureCount?: number;
 }
+export declare class ReCoreLearnDto extends DBDto {
+    normalId?: number;
+    threshold: number;
+}
+export declare class BaseDBDto {
+    normalId: number;
+    name: string;
+}
+export declare class MergeDBDto {
+    baseDB: BaseDBDto[];
+    newDB: string;
+}
 export declare class FeatureRes {
     id: number;
     x: number;
     y: number;
+    position: number[];
 }
 export declare class CropSamplesDto {
     src: string;

package/dist/app.dto.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InsertSamplesDto = exports.UpdateSamplesDto = exports.SampleFeatureDto = exports.SampleDto = exports.EraseSamplesDto = exports.CropSamplesDto = exports.FeatureRes = exports.CoreLearnDto = exports.FeatureExtractRes = exports.FeatureExtractDto = exports.ImageDto = exports.QueryRes = exports.QueryDto = exports.UpdateDBDto = exports.EraseByTypeDto = exports.DeleteFromDBDto = exports.InsertToDBDto = exports.FeatureDto = exports.IdTypeDto = exports.DBDto = void 0;
+exports.InsertSamplesDto = exports.UpdateSamplesDto = exports.SampleFeatureDto = exports.SampleDto = exports.EraseSamplesDto = exports.CropSamplesDto = exports.FeatureRes = exports.MergeDBDto = exports.BaseDBDto = exports.ReCoreLearnDto = exports.CoreLearnDto = exports.FeatureExtractRes = exports.FeatureExtractDto = exports.ImageDto = exports.QueryRes = exports.QueryDto = exports.UpdateDBDto = exports.EraseByTypeDto = exports.DeleteFromDBDto = exports.InsertToDBDto = exports.FeatureDto = exports.IdTypeDto = exports.DeleteDBDto = exports.DBDto = void 0;
 const openapi = require("@nestjs/swagger");
 const swagger_1 = require("@nestjs/swagger");
 const feature = 'AKByOgAggz0AAKM9ACDXOgCg2DwAANE8ACC7PABAtjsAIA09AECCPAAABj0AQOc8AAAAAADAEDwAQLg8AKB6PQAAWTsAwHA8AMDFPQDAiT0AAAAAAMC+OgCgdT0AoJ89AOC5PQBAPT0AYBc9AABdOwCAGD0AYMs8AMA2OwAgBT4AAMA8AEDxOgAAAAAAAAAAAIAJPgBg4DwAAGM9AMCgPADAgDwAwJ08AICoPADgvz0AAAAAACB4PQCArTwAoJ89AGCgPACgXD4AAL47ACCsPAAACj0AYIM9AMCQOwCAtj0AYC88AAAAAADgMz0A4Nw8AMA3PQAgITwAYDk9ACC/PQBgHTwAAAAAAAC9PQBg2j0AADw9AKBxPQAgHzsAQOg9AEDOOwAAAAAAgBs9AEAePgCg5DoA4OY9AKCwPABAujsAgLI9AGAPPQCAbT0AQJw9AABZPQDA3TwA4NM9AED5OwAAVD0AAAAAAEANPAAA7T0AYLs8ACAOPQAAAAAAwKI7AIB3PQAA8D0AQHw8AOC1PACgDz0A4Hs9AKACPAAgNz0AIBk8AADLPQBA1jwAQJw5AKApPQAgoD0AwFc9AAAAAADgMT0AIDI+AAAAAAAAAAAAoJ48AMBaOgBgZjwAQIE9AMDRPQDgsT0AQCU8AKBmPQDA/zwAQN88AGCuPQBAbTwAQO08AKDcOwBAmjwAIJE7AODROwDA6TwAQBI9AKCHPQAAAAAAAAAAAACQOwCA6TwAoA8+AKBYPQDgRzwAYIU9AMDsOgDgZj0AIAw+AGAJPADgvDwAYNE9AAAAAADAiTsAwDQ7AABxPAAgaTwAwDA9AEBePQAAAAAAAMw9AKA2PABAqDwAwIU9AAAAAABgij0AAAAAAGDeOwBAwDwAwAE9ACAKPQAAAAAAQEQ9ACC6OgAAcDkA4Ck6AIDRPADAUjwAYIc9AOAoPAAAyDwAYCo9AMAAPgDAvzwAwKU6AIAHPQDABT0A4Iw9AIAKPgDgAz0AYNU7AEC5OwBAHjsAgOI8AAAAAABgqjwAAAAAAOANOwBg2DwAAAAAAEBBOgCgvz0A4M88AGDkPABAADsAAHk9AABsOwAAAAAAANg8AAAAAADgUTwA4IY9AAAAAACgFz0AYIE7ACCrPQAAAAAAYM08AOAVPQCAvD0AwBY7AAAAAACAATwAQCI9ACCNOgBg9DkAAAAAAOCOOwAA+jwAIJw9AGBJOgDgCT0AYGA8AGApPQBguT0AoAU8AGAPPQAAmjwAgKs8AKCPOwDArj0AwDE9AAAAAACArT0AQJE9AGBMPQAAAAAAAJs8AAAAAADAgjwAALI9AGBbPQAAAAAAAAAAAAAAAACgJzwAQJA8AAAKOgAAAAAAAAAAAKDPOgBAOzwAoLA8AAAAAACgej0AIJg8AMAuPAAAAAAAAAAAAEA6PAAAqT0AAAAAAAAAAAAAST0AwL46AKAROwAA7TsAYNU8AMABPABAqzsAAAs9AKCwPQAgqT0AAAAAAMAJPgCAETwAgI48AOCpOwAgzj0AQGQ9AAAAAACg6DoAYM89AAAAAAAgmjwAIIU9AGCBPQDgCDwAYDA8AEANPgAAAAAAgD48AMCfPABAwTsAQKE8AKDSOwCAmTsAAAAAAMBPPQBgJDoAAAAAACB7PgAAAAAAAAAAAAAAAADgwj0AYCk8AOB6PQDA2j0A4DU7ACBlPQCg/jwAYPg8ACA/OwAgwzwAAPo7AAAAAAAgAT0AIPU8AAAePgAAnTwAoNM8AECHOgDAOTwAAAAAAAAAAABgIDwAIJs8ACBNPQBAZzwAQLU8ACAIPAAgqD0AwHw8AMBvPACAGT4A4LM9AKALPAAgjToAILE9AKAwPQBgqDwAQI09AICsPQAAVj0A4LM9AAAAAAAAAAAAAAAAAAAAAADg5zoAYIo8AIBjPACg+zsAAAAAACDIPACAGT0AYJE9AKBuPAAgazwAwMM8AAAAAADg9zoAYFk9ACCNPQAAADsAgBQ8AGBHPAAAAAAAYCA6AGCpPQDgPD0AACw9AAAAAAAAjjsAoIw8';
@@ -23,6 +23,16 @@ __decorate([
     (0, swagger_1.ApiProperty)({ example: 'test.db', description: 'db路径' }),
     __metadata("design:type", String)
 ], DBDto.prototype, "db", void 0);
+class DeleteDBDto extends DBDto {
+    static _OPENAPI_METADATA_FACTORY() {
+        return { deleteSamples: { required: false, type: () => Boolean } };
+    }
+}
+exports.DeleteDBDto = DeleteDBDto;
+__decorate([
+    (0, swagger_1.ApiProperty)({ example: true, description: '是否删除对应sample目录' }),
+    __metadata("design:type", Boolean)
+], DeleteDBDto.prototype, "deleteSamples", void 0);
 class IdTypeDto {
     static _OPENAPI_METADATA_FACTORY() {
         return { id: { required: true, type: () => Number }, type: { required: true, type: () => Number } };
@@ -210,9 +220,51 @@ __decorate([
     (0, swagger_1.ApiProperty)({ required: false, default: 1024, example: 1024, description: '一次提取的特征数' }),
     __metadata("design:type", Number)
 ], CoreLearnDto.prototype, "featureCount", void 0);
+class ReCoreLearnDto extends DBDto {
+    static _OPENAPI_METADATA_FACTORY() {
+        return { normalId: { required: false, type: () => Number }, threshold: { required: true, type: () => Number } };
+    }
+}
+exports.ReCoreLearnDto = ReCoreLearnDto;
+__decorate([
+    (0, swagger_1.ApiProperty)({ required: false, default: 0, example: 0, description: '正常特征的编号', }),
+    __metadata("design:type", Number)
+], ReCoreLearnDto.prototype, "normalId", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ example: 0.9, description: '提取特征的阈值' }),
+    __metadata("design:type", Number)
+], ReCoreLearnDto.prototype, "threshold", void 0);
+class BaseDBDto {
+    static _OPENAPI_METADATA_FACTORY() {
+        return { normalId: { required: true, type: () => Number }, name: { required: true, type: () => String } };
+    }
+}
+exports.BaseDBDto = BaseDBDto;
+__decorate([
+    (0, swagger_1.ApiProperty)({ example: 0, description: '正常特征的编号', }),
+    __metadata("design:type", Number)
+], BaseDBDto.prototype, "normalId", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ example: 'test.db', description: 'db路径' }),
+    __metadata("design:type", String)
+], BaseDBDto.prototype, "name", void 0);
+class MergeDBDto {
+    static _OPENAPI_METADATA_FACTORY() {
+        return { baseDB: { required: true, type: () => [require("./app.dto").BaseDBDto] }, newDB: { required: true, type: () => String } };
+    }
+}
+exports.MergeDBDto = MergeDBDto;
+__decorate([
+    (0, swagger_1.ApiProperty)({ description: '被合并的db数据列表', }),
+    __metadata("design:type", Array)
+], MergeDBDto.prototype, "baseDB", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ description: '合并的目标db名' }),
+    __metadata("design:type", String)
+], MergeDBDto.prototype, "newDB", void 0);
 class FeatureRes {
     static _OPENAPI_METADATA_FACTORY() {
-        return { id: { required: true, type: () => Number }, x: { required: true, type: () => Number }, y: { required: true, type: () => Number } };
+        return { id: { required: true, type: () => Number }, x: { required: true, type: () => Number }, y: { required: true, type: () => Number }, position: { required: true, type: () => [Number] } };
     }
 }
 exports.FeatureRes = FeatureRes;
@@ -228,6 +280,10 @@ __decorate([
     (0, swagger_1.ApiProperty)({ example: 23, description: '特征起点y' }),
     __metadata("design:type", Number)
 ], FeatureRes.prototype, "y", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ description: '[x,y,w,h,cx,cy]' }),
+    __metadata("design:type", Array)
+], FeatureRes.prototype, "position", void 0);
 class CropSamplesDto {
     static _OPENAPI_METADATA_FACTORY() {
         return { src: { required: true, type: () => String }, sampleDir: { required: true, type: () => String }, data: { required: true, type: () => [require("./app.dto").FeatureRes] } };

package/dist/app.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.dto.js","sourceRoot":"","sources":["../src/app.dto.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app.dto.js","sourceRoot":"","sources":["../src/app.dto.ts"],"names":[],"mappings":"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"}

package/dist/app.library.d.ts

@@ -4,6 +4,8 @@ export declare const anomaly: (dllPath: string) => {
     initEngine: import("ffi-napi").ForeignFunction<boolean, [string, number, number, number, number, number]>;
     destroyEngine: import("ffi-napi").ForeignFunction<boolean, []>;
     coreLearn: import("ffi-napi").ForeignFunction<number, [string, ref.Pointer<number>, ref.Pointer<number>, number, number, number, number, number, number, ref.Pointer<number>]>;
+    refreshCoreLearn: import("ffi-napi").ForeignFunction<number, [string, number, number]>;
+    mergeMDbNgFeature: import("ffi-napi").ForeignFunction<number, [string, string, ref.Pointer<number>, ref.Pointer<number>, ref.Pointer<number>, ref.Pointer<number>]>;
     featureExtract: import("ffi-napi").ForeignFunction<boolean, [ref.Pointer<number>, number, number, number, ref.Pointer<number>, ref.Pointer<number>]>;
     erase: import("ffi-napi").ForeignFunction<number, [string, number, ref.Pointer<number>]>;
     erase_type: import("ffi-napi").ForeignFunction<number, [string, number]>;

package/dist/app.library.js

@@ -75,6 +75,25 @@ const anomaly = (dllPath) => {
             int,
             [CString, UChanrArrayPtr, UChanrArrayPtr, int, int, int, int, int, float, FloatArrayPtr],
         ],
+        /**
+         * 提取当前db中的NG特征以及OK特征，以NG特征为基础，重新将ok特征进行好品建模
+         * @param args_0 [in]db名称
+         * @param args_1 [in]相似阈值
+         * @param args_2 [in]提取特征的最大数
+         * @returns db的特征总条数
+         */
+        refreshCoreLearn: [int, [CString, float, int]],
+        /**
+         * 传递多个baseDB, 提取其中的NG特征为一个db，同时获取ng特征对应的id编号。 id按照传入的baseDB排列
+         * @param args_0 [in]传递多个baseDb名称， 每个db按","为间隔符
+         * @param args_1 [in]合并全部baseDb中ng的db名称，可以作为新配方的db名称
+         * @param args_2 [in]传递的每个DB对应的正常类别id, 长度等于baseDbNames的长度
+         * @param args_3 [in]返回所有提取后的缺陷特征对应的id
+         * @param args_4 [in]返回每一个basedb中提取的ng特征的数量
+         * @param args_5 [in]chunkNum的长度，等于输入的baseDbs的数量
+         * @returns db的特征总条数
+         */
+        mergeMDbNgFeature: [int, [CString, CString, IntArrayPtr, IntArrayPtr, IntArrayPtr, IntArrayPtr]],
         /**
          * 提取特征
          * @param args_0 [in]图像buffer

package/dist/app.library.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.library.js","sourceRoot":"","sources":["../src/app.library.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,wDAA2B;AAC3B,uCAAmC;AACnC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,kBAAG,CAAC,KAAK,CAAC;AAC3E,MAAM,aAAa,GAAG,kBAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACzC,MAAM,WAAW,GAAG,kBAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACvC,MAAM,cAAc,GAAG,kBAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAGnC,MAAM,OAAO,GAAG,CAAC,OAAe,EAAE,EAAE;IACzC,MAAM,OAAO,GAAG,IAAI,kBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE;QACzD;;;WAGG;QACH,eAAe,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC;QAC9B;;;;;;;;;WASG;QACH,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACtD;;;WAGG;QACH,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACzB;;;;;;;;;;;;;WAaG;QACH,SAAS,EAAE;YACT,GAAG;YACH,CAAC,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,aAAa,CAAC;SACzF;QACD;;;;;;;;;WASG;QACH,cAAc,EAAE,CAAC,IAAI,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;QACrF;;;;;;WAMG;QACH,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;QACzC;;;;;WAKG;QACH,UAAU,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACjC;;;;WAIG;QACH,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QACzB;;;;WAIG;QACH,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC;QAC7B;;;;;;;;WAQG;QACH,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;QACtE;;;;;;;;WAQG;QACH,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;QACtE;;;;;;;;;WASG;QACH,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;KACtF,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;IACvC,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAlHW,QAAA,OAAO,WAkHlB;AAEK,MAAM,KAAK,GAAG,CAAC,OAAe,EAAE,EAAE;IACvC,MAAM,KAAK,GAAG,IAAI,kBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;QACrD;;;WAGG;QACH,eAAe,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC;QAC9B,gCAAgC;QAChC,yBAAyB;QACzB,kBAAkB;QAClB,mCAAmC;QACnC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC;QAC/B,OAAO;QACP,oBAAoB;QACpB,8CAA8C;QAC9C,iBAAiB;QACjB,iBAAiB;QACjB,mBAAmB;QACnB,4BAA4B;QAC5B,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACnE,UAAU;QACV,uBAAuB;QACvB,wBAAwB;QACxB,mBAAmB;QACnB,mBAAmB;QACnB,qBAAqB;QACrB,+BAA+B;QAC/B,OAAO,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC7D,qDAAqD;QACrD,eAAe;QACf,aAAa;QACb,aAAa;QACb,kBAAkB;QAClB,kBAAkB;QAClB,kBAAkB;QAClB,gBAAgB;QAChB,cAAc;QACd,cAAc;QACd,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;KAC1F,CAAC,CAAC;IAEH,uCAAuC;IACvC,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AA3CW,QAAA,KAAK,SA2ChB"}
+{"version":3,"file":"app.library.js","sourceRoot":"","sources":["../src/app.library.ts"],"names":[],"mappings":"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"}

package/dist/app.service.d.ts

@@ -1,5 +1,5 @@
 import { OnModuleInit, OnModuleDestroy } from '@nestjs/common';
-import { FeatureDto, FeatureRes, QueryRes, IdTypeDto, CoreLearnDto, CropSamplesDto, FeatureExtractDto, FeatureExtractRes, SampleDto, SampleFeatureDto } from "./app.dto";
+import { FeatureDto, FeatureRes, QueryRes, IdTypeDto, CoreLearnDto, CropSamplesDto, ReCoreLearnDto, MergeDBDto, FeatureExtractDto, FeatureExtractRes, SampleDto, SampleFeatureDto } from "./app.dto";
 /**
  * 图像
  */
@@ -85,9 +85,10 @@ export declare class AppService implements OnModuleInit, OnModuleDestroy {
     /**
      * 删除db文件
      * @param db db路径
+     * @param deleteSamples 是否删除对应sample目录
      * @returns 操作是否成功
      */
-    delete(db: string): Promise<boolean>;
+    delete(db: string, deleteSamples?: boolean): Promise<boolean>;
     /**
      * 插入数据
      * @param db db路径
@@ -132,6 +133,14 @@ export declare class AppService implements OnModuleInit, OnModuleDestroy {
      * 此操作会向db写入特征数据与生成对应的sample小图
      */
     coreLearn(data: CoreLearnDto): Promise<FeatureRes[]>;
+    /**
+     * 提取当前db中的NG特征以及OK特征，以NG特征为基础，重新将ok特征进行好品建模
+     */
+    refreshCoreLearn(data: ReCoreLearnDto): Promise<number>;
+    /**
+     * 传递多个baseDB, 提取其中的NG特征为一个db，同时获取ng特征对应的id编号。 id按照传入的baseDB排列
+     */
+    mergeMDbNgFeature(data: MergeDBDto): Promise<number>;
     /**
      * 裁剪sample小图
      */

package/dist/app.service.js

@@ -48,6 +48,8 @@ const common_1 = require("@nestjs/common");
 const event_emitter_1 = require("@nestjs/event-emitter");
 const app_utils_1 = require("./app.utils");
 const app_library_1 = require("./app.library");
+/** db最大的特征数 */
+const MAX_FEATURE_COUNT = 16384;
 let AppService = class AppService {
     constructor(config) {
         this.KLConfig = Object.assign({
@@ -143,16 +145,28 @@ let AppService = class AppService {
     /**
      * 删除db文件
      * @param db db路径
+     * @param deleteSamples 是否删除对应sample目录
      * @returns 操作是否成功
      */
-    async delete(db) {
+    async delete(db, deleteSamples) {
         const bool = await this.release(db);
         try {
             const dbPath = path.join(this.KLConfig.dbPath, db);
             await fs.access(dbPath);
-            return fs.unlink(dbPath).then(() => true);
+            await fs.unlink(dbPath);
+        }
+        catch (error) {
+            console.error(error);
+        }
+        try {
+            if (deleteSamples) {
+                const samplePath = path.join(this.KLConfig.samplePath, db);
+                await fs.rmdir(samplePath, { recursive: true });
+            }
+        }
+        catch (error) {
+            console.error(error);
         }
-        catch (error) { }
         return bool;
     }
     /**
@@ -216,7 +230,9 @@ let AppService = class AppService {
         const bufferScores = kl_buffer_1.default.alloc(length * 4);
         const bufferTypes = kl_buffer_1.default.alloc(length * 4);
         const bufferIds = kl_buffer_1.default.alloc(length * 4);
-        await (0, node_util_1.promisify)(this.KLDBLib.query.async)(db, length, bufferFeatures, bufferScores.ptr, bufferTypes.ptr, bufferIds.ptr);
+        const bool = await (0, node_util_1.promisify)(this.KLDBLib.query.async)(db, length, bufferFeatures, bufferScores.ptr, bufferTypes.ptr, bufferIds.ptr);
+        if (!bool)
+            return Promise.reject('查询失败');
         return { scores: bufferScores.floatArray, ids: bufferIds.intArray, types: bufferTypes.intArray };
     }
     /**
@@ -271,14 +287,58 @@ let AppService = class AppService {
         do {
             num = await (0, node_util_1.promisify)(this.KLDBLib.coreLearn.async)(db, buffer, bufferMask, height, width, channel, normalId, featureCount, threshold, bufferFeatures.buffer);
             const arr = bufferFeatures.intArray;
+            const w2 = this.KLConfig.featureWidth / 2;
+            const h2 = this.KLConfig.featureHeight / 2;
             for (let i = 0; i < num; i++) {
-                features.push({ id: arr[3 * i], x: arr[3 * i + 1], y: arr[3 * i + 2] });
+                // 中心点
+                const x = arr[3 * i + 1];
+                const y = arr[3 * i + 2];
+                features.push({
+                    id: arr[3 * i],
+                    x: x - w2,
+                    y: y - h2,
+                    // [x,y,w,h,cx,cy]
+                    position: [x - 12, y - 12, 24, 24, x - w2, y - h2],
+                });
             }
         } while (learnUntilNone && num === featureCount);
         this.cropSamples(buffer, width, height, channel, sampleDir, features);
         bufferMask && this.freeImg(bufferMask);
         return features;
     }
+    /**
+     * 提取当前db中的NG特征以及OK特征，以NG特征为基础，重新将ok特征进行好品建模
+     */
+    async refreshCoreLearn(data) {
+        const { db, threshold, normalId } = data;
+        const count = await (0, node_util_1.promisify)(this.KLDBLib.refreshCoreLearn.async)(db, threshold, normalId || 0);
+        // 偶发读取db文件失败，怀疑算法端refreshCoreLearn异步返回
+        await (0, app_utils_1.sleep)(100);
+        // 清理被移除的特征对应的sample小图
+        await this.formatSamples(db);
+        return count;
+    }
+    /**
+     * 传递多个baseDB, 提取其中的NG特征为一个db，同时获取ng特征对应的id编号。 id按照传入的baseDB排列
+     */
+    async mergeMDbNgFeature(data) {
+        const baseDBs = [];
+        const normalIds = [];
+        data.baseDB.forEach(element => {
+            // TODO 待按db更新时间降序排序（合并策略：合并过程中遇到重复id就跳过，即以先出现的ng特征为准）
+            baseDBs.push(element.name);
+            normalIds.push(element.normalId);
+        });
+        const normalIdBuffer = kl_buffer_1.default.alloc(normalIds.length * 4);
+        normalIdBuffer.intArray = normalIds;
+        // chunkLen、chunkNum、ngId
+        const outBuffer = kl_buffer_1.default.alloc((1 + baseDBs.length + MAX_FEATURE_COUNT) * 4);
+        const count = await (0, node_util_1.promisify)(this.KLDBLib.mergeMDbNgFeature.async)(baseDBs.join(','), data.newDB, normalIdBuffer.ptr, outBuffer.intPtr[baseDBs.length + 1], outBuffer.intPtr[1], outBuffer.ptr);
+        for (let i = 0, db; db = baseDBs[i]; i++) {
+            await (0, app_utils_1.copyDBSamples)(db, data.newDB, this.KLConfig.samplePath, normalIds[i]);
+        }
+        return count;
+    }
     /**
      * 裁剪sample小图
      */

package/dist/app.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.service.js","sourceRoot":"","sources":["../src/app.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app.service.js","sourceRoot":"","sources":["../src/app.service.ts"],"names":[],"mappings":"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"}

package/dist/app.utils.d.ts

@@ -1,5 +1,9 @@
 import KLBuffer from "kl-buffer";
 import { IdTypeDto, FeatureDto, SampleDto } from "./app.dto";
+/**
+ * 睡眠time毫秒
+ */
+export declare function sleep(time: number): Promise<number>;
 export declare function getKLBufferByIntArray(array: number[]): KLBuffer;
 export declare function getBufferByBase64(data: string[], featureDIM: number): Buffer;
 /**
@@ -14,6 +18,10 @@ export declare function formatSamples(samplePath: string, data: FeatureDto[]): P
  * 拷贝sample小图；将没有拷贝成功的从列表中移除
  */
 export declare function copySamples(data: SampleDto[]): Promise<void>;
+/**
+ * 将一个db下的samples小图拷贝到另一个文件夹下
+ */
+export declare function copyDBSamples(baseDB: string, newDB: string, samplePath: string, normalId?: number): Promise<void>;
 /**
  * 删除sample小图
  */