@koala123/aoi-db 1.0.7 → 1.1.5

package/README.md

@@ -2,7 +2,7 @@
 
 AOIDB模块
 
-> 此模块依赖anomaly.dll与og-common.dll库
+> 此模块依赖anomaly.dll与wafer.dll库
 
 ## Usage
 

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,6 +55,18 @@ 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;
@@ -59,9 +74,6 @@ export declare class FeatureRes {
 }
 export declare class CropSamplesDto {
     src: string;
-    width: number;
-    height: number;
-    channel: number;
     sampleDir: string;
     data: FeatureRes[];
 }

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 = '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';
@@ -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,6 +220,48 @@ __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 } };
@@ -230,7 +282,7 @@ __decorate([
 ], FeatureRes.prototype, "y", void 0);
 class CropSamplesDto {
     static _OPENAPI_METADATA_FACTORY() {
-        return { src: { required: true, type: () => String }, width: { required: true, type: () => Number }, height: { required: true, type: () => Number }, channel: { required: true, type: () => Number }, sampleDir: { required: true, type: () => String }, data: { required: true, type: () => [require("./app.dto").FeatureRes] } };
+        return { src: { required: true, type: () => String }, sampleDir: { required: true, type: () => String }, data: { required: true, type: () => [require("./app.dto").FeatureRes] } };
     }
 }
 exports.CropSamplesDto = CropSamplesDto;
@@ -238,18 +290,6 @@ __decorate([
     (0, swagger_1.ApiProperty)({ example: 'D:/kl-storage/gallery/1.bmp', description: '被裁剪图像的地址' }),
     __metadata("design:type", String)
 ], CropSamplesDto.prototype, "src", void 0);
-__decorate([
-    (0, swagger_1.ApiProperty)({ required: false, example: 5120, description: '图像宽；默认值为配置文件中的width' }),
-    __metadata("design:type", Number)
-], CropSamplesDto.prototype, "width", void 0);
-__decorate([
-    (0, swagger_1.ApiProperty)({ required: false, example: 5120, description: '图像高；默认值为配置文件中的height' }),
-    __metadata("design:type", Number)
-], CropSamplesDto.prototype, "height", void 0);
-__decorate([
-    (0, swagger_1.ApiProperty)({ required: false, example: 3, description: '图像通道；默认值为配置文件中的channel' }),
-    __metadata("design:type", Number)
-], CropSamplesDto.prototype, "channel", void 0);
 __decorate([
     (0, swagger_1.ApiProperty)({ example: 'D:/kl-storage/gallery/samples/', description: '对应的sample小图的目录' }),
     __metadata("design:type", String)

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]>;
@@ -13,8 +15,10 @@ export declare const anomaly: (dllPath: string) => {
     update: import("ffi-napi").ForeignFunction<number, [string, number, ref.Pointer<number>, ref.Pointer<number>, ref.Pointer<number>]>;
     query: import("ffi-napi").ForeignFunction<boolean, [string, number, ref.Pointer<number>, ref.Pointer<number>, ref.Pointer<number>, ref.Pointer<number>]>;
 };
-export declare const shmem: (dllPath: string) => {
-    copy: import("ffi-napi").ForeignFunction<void, [ref.Pointer<number>, number, number, ref.Pointer<number>, ref.Pointer<number>, number, number, ref.Pointer<number>, number]>;
-    imread: import("ffi-napi").ForeignFunction<boolean, [string, ref.Pointer<number>, number, number, number, boolean]>;
-    imwrite: import("ffi-napi").ForeignFunction<boolean, [string, ref.Pointer<number>, number, number, number, boolean]>;
+export declare const wafer: (dllPath: string) => {
+    get_dll_version: import("ffi-napi").ForeignFunction<string, []>;
+    free_img: import("ffi-napi").ForeignFunction<void, [ref.Pointer<unknown>]>;
+    imread: import("ffi-napi").ForeignFunction<boolean, [string, unknown, unknown, unknown, unknown]>;
+    imwrite: import("ffi-napi").ForeignFunction<boolean, [string, unknown, unknown, unknown, unknown]>;
+    imcrop: import("ffi-napi").ForeignFunction<boolean, [ref.Pointer<unknown>, unknown, unknown, unknown, unknown, unknown, unknown, unknown, unknown]>;
 };

package/dist/app.library.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shmem = exports.anomaly = void 0;
+exports.wafer = exports.anomaly = void 0;
 const path = __importStar(require("path"));
 const ref_napi_1 = __importDefault(require("ref-napi"));
 const ffi_napi_1 = require("ffi-napi");
@@ -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
@@ -149,48 +168,48 @@ const anomaly = (dllPath) => {
     return anomaly;
 };
 exports.anomaly = anomaly;
-const shmem = (dllPath) => {
-    const shmem = new ffi_napi_1.Library(path.join(dllPath, 'og-common'), {
-        /**
-         * 图像复制，将src的src_roi区域复制至dst的dst_roi区域
-         * @param args_0 [in]原图像buffer
-         * @param args_1 [in]原图像高
-         * @param args_2 [in]原图像宽
-         * @param args_3 [in:int]原图的感兴趣区域：[x,y,w,h]
-         * @param args_4 [in/out]目标图的数据指针
-         * @param args_5 [in]目标图的高
-         * @param args_6 [in]目标图的宽
-         * @param args_7 [in:int]目标图的感兴趣区域：[x,y,w,h]
-         * @param args_8 [in]图像通道
-         */
-        copy: [
-            _void,
-            [UChanrArrayPtr, int, int, IntArrayPtr, UChanrArrayPtr, int, int, IntArrayPtr, int],
-        ],
+const wafer = (dllPath) => {
+    const wafer = new ffi_napi_1.Library(path.join(dllPath, 'wafer'), {
         /**
-         * 读图
-         * @param args_0 [in]图像地址
-         * @param args_1 [out]图像buffer
-         * @param args_2 [in]图像擎高
-         * @param args_3 [in]图像宽
-         * @param args_4 [in]图像通道
-         * @param args_5 [in]是否是utf-8
-         * @returns 是否成功
-         */
-        imread: [bool, [CString, UChanrArrayPtr, int, int, int, bool]],
-        /**
-         * 写图
-         * @param args_0 [in]图像地址
-         * @param args_1 [in]图像buffer
-         * @param args_2 [in]图像擎高
-         * @param args_3 [in]图像宽
-         * @param args_4 [in]图像通道
-         * @param args_5 [in]是否是utf-8
-         * @returns 是否成功
+         * 获取dll版本信息
+         * @return 版本号
          */
-        imwrite: [bool, [CString, UChanrArrayPtr, int, int, int, bool]],
+        get_dll_version: [CString, []],
+        /////////////////////////// 公共组件
+        //////////////// 1.6 图像数据
+        /// 释放图像数据内存，按指针传递
+        /// img[in] 图像数据内存指针（Buffer(uchar)）
+        free_img: ["void", ["uchar *"]],
+        /// 读图片
+        /// file[in] 读入图片的路径
+        /// img[out] 读入图片的数据指针（free_img或free_pimg手动释放）
+        /// h[out] 读入图片的高
+        /// w[out] 读入图片的宽
+        /// c[out] 读入图片的通道数
+        /// return true:成功, false:失败
+        imread: ["bool", ["string", "uchar **", "int *", "int *", "int *"]],
+        // /// 写图片
+        // /// file[in] 写出图片的路径
+        // /// img[in] 写出图片的数据指针
+        // /// h[in] 写出图片的高
+        // /// w[in] 写出图片的宽
+        // /// c[in] 写出图片的通道数
+        // /// return true:成功, false:失败
+        imwrite: ["bool", ["string", "uchar *", "int", "int", "int"]],
+        /// 将src(fromX:fromX+dstW, fromY:fromY+dstH)区域抠图到dst中
+        /// src 原图的数据指针
+        /// srcH 原图的高
+        /// srcW 原图的宽
+        /// channels 图像的通道
+        /// fromX 小图左上角X坐标
+        /// fromY 小图左上角Y坐标
+        /// dst 目标图的数据指针
+        /// dstH 目标图的高
+        /// dstW 目标图的宽
+        imcrop: ["bool", ["uchar *", "int", "int", "int", "int", "int", "uchar *", "int", "int"]],
     });
-    return shmem;
+    // console.log(wafer.get_dll_version())
+    return wafer;
 };
-exports.shmem = shmem;
+exports.wafer = wafer;
 //# sourceMappingURL=app.library.js.map

package/dist/app.library.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.library.js","sourceRoot":"","sources":["../src/app.library.ts"],"names":[],"mappings":"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"}
+{"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,20 @@
 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";
+/**
+ * 图像
+ */
+export interface image {
+    /** 图像地址 */
+    path: string;
+    /** 图像buffer */
+    buffer: Buffer;
+    /** 图像宽 */
+    width: number;
+    /** 图像高 */
+    height: number;
+    /** 图像通道 */
+    channel: number;
+}
 export interface KLConfig {
     /** dllPath；默认值：D:/kl-storage/dll/ */
     dllPath: string;
@@ -27,10 +42,10 @@ export interface KLConfig {
 export declare class AppService implements OnModuleInit, OnModuleDestroy {
     /** 配置项 */
     private KLConfig;
-    /** KL工具库 */
-    private UtilsLib;
     /** KLDB库 */
     private KLDBLib;
+    /** KL-wafer库 */
+    private WaferLib;
     constructor(config: Partial<KLConfig>);
     onModuleInit(): void;
     onModuleDestroy(): void;
@@ -70,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路径
@@ -117,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小图
      */
@@ -152,11 +176,16 @@ export declare class AppService implements OnModuleInit, OnModuleDestroy {
      */
     formatSamples(db: string): Promise<void>;
     /**
-     * 读图
+     * 释放图像数据内存，按指针传递
      */
+    private freeImg;
     private readImage;
     /**
      * 写图
      */
     private writeImage;
+    /**
+     * 拷贝图像
+     */
+    private pasteImage;
 }