diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/central-data-repository.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/central-data-repository.js index 2cf9985b..04d787a3 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/central-data-repository.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/central-data-repository.js @@ -285,7 +285,6 @@ class CentralDataRepository { inferImportPath(typeName, fromPath) { const location = this.getTypeLocation(typeName); if (!location) { - console.warn(`⚠️ CDR.inferImportPath: 类型 "${typeName}" 未找到`); return null; } @@ -319,17 +318,6 @@ class CentralDataRepository { const relativePath = '../'.repeat(upLevels) + downPath.join('/'); - // 调试输出（临时 - 打印前5次调用） - if (!this._debugCount) this._debugCount = 0; - if (this._debugCount < 5) { - console.log(`🔍 [${++this._debugCount}] inferImportPath: ${typeName}`); - console.log(` fromPath: ${fromPath} → fromDir: ${fromDir}`); - console.log(` from: [${from.join(', ')}] (${from.length} parts)`); - console.log(` to: [${to.join(', ')}] (${to.length} parts)`); - console.log(` commonLength: ${commonLength}, upLevels: ${upLevels}`); - console.log(` relativePath: ${relativePath}`); - } - // 移除 .ts 后缀 return relativePath.replace(/\.ts$/, ''); } diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/controller-generator.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/controller-generator.js index 6052b7d0..7235f908 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/controller-generator.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/controller-generator.js @@ -51,6 +51,9 @@ class ControllerGenerator { const fileName = this.namingUtils.generateFileName(javaController.className, 'controller'); const filePath = path.join(fullOutputDir, fileName); + // ✅ 保存NestJS文件路径供CDR使用 + javaController.nestjsFilePath = path.join('controllers', subDir, fileName); + const content = this.generateControllerContent(javaController, controllerName); fs.writeFileSync(filePath, content); @@ -320,9 +323,30 @@ ${methods} // 添加DTO导入 if (javaController.dtos && javaController.dtos.length > 0) { javaController.dtos.forEach(dto => { - const dtoName = this.namingUtils.generateDtoName(dto); - const dtoFileName = this.namingUtils.generateFileName(dto, 'dto'); - imports.push(`import { ${dtoName} } from '../dtos/${dtoFileName.replace('.dto.ts', '')}';`); + // 清理泛型语法 + const cleanDto = dto.replace(/<[^>]+>/g, ''); + + // 跳过Java基础类型 + if (['List', 'ArrayList', 'Map', 'HashMap', 'Set', 'HashSet', 'Record', 'String', 'Integer', 'Long', 'Boolean'].includes(cleanDto)) { + return; + } + + // Java类名本身带后缀，不要重复添加 + const typeName = this.namingUtils.toPascalCase(cleanDto); + + // ✅ 使用CDR查询DTO路径 + let importPath = null; + if (this.cdr && javaController.nestjsFilePath) { + importPath = this.cdr.inferImportPath(cleanDto, javaController.nestjsFilePath); + } + + // 兜底：硬编码路径 + if (!importPath) { + const dtoFileName = this.namingUtils.generateFileName(cleanDto, 'dto'); + importPath = `../dtos/${dtoFileName.replace('.ts', '')}`; + } + + imports.push(`import { ${typeName} } from '${importPath}';`); }); } diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/entity-generator.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/entity-generator.js index 06339df1..2dac544f 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/entity-generator.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/entity-generator.js @@ -31,6 +31,18 @@ class EntityGenerator { const content = this.generateEntityContent(javaEntity, entityName); fs.writeFileSync(filePath, content); + // ✅ 记录Entity位置到CDR + if (this.cdr) { + const originalClassName = javaEntity.className; + const relativePath = `entities/${fileName}`; + this.cdr.setTypeLocation(originalClassName, { + relativePath, + absolutePath: filePath, + category: 'entity', + module: javaEntity.module || 'common' + }); + } + console.log(`✅ 生成实体: ${filePath}`); return { fileName, content }; } diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/enum-generator.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/enum-generator.js index 458468da..4b937e35 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/enum-generator.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/enum-generator.js @@ -25,6 +25,18 @@ class EnumGenerator { const content = this.generateEnumContent(javaEnum, enumName); fs.writeFileSync(filePath, content); + // ✅ 记录Enum位置到CDR + if (this.cdr) { + const originalClassName = javaEnum.className; + const relativePath = `enums/${fileName}`; + this.cdr.setTypeLocation(originalClassName, { + relativePath, + absolutePath: filePath, + category: 'enum', + module: javaEnum.module || 'common' + }); + } + console.log(`✅ 生成枚举: ${filePath}`); return { fileName, content }; } diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/module-generator.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/module-generator.js index 6babee71..df0878df 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/module-generator.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/module-generator.js @@ -187,11 +187,9 @@ export class CommonModule {} */ generateServiceModule(serviceModule) { console.log('📋 生成服务模块...'); - console.log(`🔍 Service components: ${serviceModule.components ? serviceModule.components.length : 0} 个`); // 生成具体的服务文件 if (serviceModule.components && serviceModule.components.length > 0) { - console.log(`🔧 开始生成${serviceModule.components.length}个Service...`); serviceModule.components.forEach(service => { const serviceDir = path.join(this.outputDir, 'services'); if (!fs.existsSync(serviceDir)) { diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/service-generator.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/service-generator.js index 4cc18f6c..19f92721 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/service-generator.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/service-generator.js @@ -326,12 +326,6 @@ ${methods} * ✅ 增强：接收额外的imports（NestJS异常、Node.js模块、Boot服务） */ generateImports(javaService, additionalImports = {}) { - // 调试：检查CDR状态（临时） - if (!this._cdrDebugPrinted) { - console.log(`🔍 Service Generator.generateImports: this.cdr = ${this.cdr ? 'PRESENT' : 'NULL'}`); - this._cdrDebugPrinted = true; - } - const imports = [ "import { Injectable } from '@nestjs/common';" ]; @@ -433,11 +427,6 @@ ${methods} // ⚠️ 关键：使用生成的NestJS文件路径，而不是Java源文件路径 const currentPath = javaService.nestjsFilePath || javaService.filePath || 'services/admin'; importPath = this.cdr.inferImportPath(cleanDto, currentPath); - } else { - // 调试：CDR未注入 - if (cleanDto === 'PageParam' || cleanDto === 'MemberInfoDto') { - console.warn(`⚠️ Service Generator: this.cdr is null for ${cleanDto}!`); - } } // ⚠️ 兜底：如果CDR未找到，使用旧的硬编码路径 diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/migration-coordinator.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/migration-coordinator.js index 8a8bea7e..bd443b09 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/migration-coordinator.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/migration-coordinator.js @@ -68,30 +68,6 @@ class JavaToNestJSMigrationCoordinator { console.log(''); this.cdr.printStats(); - // ✅ V2: 打印实际记录的类型名（前20个） - console.log('\n🔍 CDR中实际记录的类型名（前20个）:'); - let count = 0; - for (const [typeName, location] of this.cdr.typeLocationIndex) { - if (count < 20) { - console.log(` ${count + 1}. ${typeName} (${location.category}) -> ${location.relativePath}`); - count++; - } else { - break; - } - } - - // ✅ V2: 测试查询几个DTO - console.log('\n🔍 测试CDR查询:'); - const testTypes = ['MemberInfoDto', 'MemberListVo', 'PageParam', 'MemberSearchParam']; - testTypes.forEach(typeName => { - const location = this.cdr.getTypeLocation(typeName); - if (location) { - console.log(` ✅ ${typeName}: ${location.relativePath}`); - } else { - console.log(` ❌ ${typeName}: 未找到`); - } - }); - } catch (error) { console.error('❌ 迁移过程中发生错误:', error.message); this.stats.errors.push(error.message); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts index 8aa8358a..9336ab83 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts @@ -6,7 +6,7 @@ import * as fs from 'fs'; import * as path from 'path'; import { AddonDevelopSearchParam } from '../../../../dtos/admin/addon/param/addon-develop-search-param.dto'; import { AddonDevelopListVo } from '../../../../dtos/admin/addon/vo/addon-develop-list-vo.dto'; -import { InstallAddonListVo } from '../dtos/install-addon-list-vo.dto'; +import { InstallAddonListVo } from '../../../../entities/install-addon-list-vo.entity'; import { AddonDevelopInfoVo } from '../../../../dtos/admin/addon/vo/addon-develop-info-vo.dto'; import { AddonDevelopAddParam } from '../../../../dtos/admin/addon/param/addon-develop-add-param.dto'; import { Map } from '../dtos/object>.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-service-impl.service.ts index 0dd057d1..8e36659f 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-service-impl.service.ts @@ -6,7 +6,7 @@ import { PageParam } from '../../../../dtos/page-param.dto'; import { GenerateSearchParam } from '../../../../dtos/admin/generator/param/generate-search-param.dto'; import { GenerateListVo } from '../../../../dtos/admin/generator/vo/generate-list-vo.dto'; import { GenerateDetailVo } from '../../../../dtos/admin/generator/vo/generate-detail-vo.dto'; -import { GenerateColumnVo } from '../dtos/generate-column-vo.dto'; +import { GenerateColumnVo } from '../../../../entities/generate-column-vo.entity'; import { GenerateParam } from '../../../../dtos/admin/generator/param/generate-param.dto'; import { GenerateEditParam } from '../../../../dtos/admin/generator/param/generate-edit-param.dto'; import { GenerateCodeParam } from '../../../../dtos/admin/generator/param/generate-code-param.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/cloud-build-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/cloud-build-service-impl.service.ts index 8c32ac85..806ba066 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/cloud-build-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/cloud-build-service-impl.service.ts @@ -3,10 +3,10 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService } from '@wwjBoot'; import * as fs from 'fs'; -import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; import { ConnectTestParam } from '../../../../dtos/admin/niucloud/param/connect-test-param.dto'; import { JSONObject } from '../dtos/j-s-o-n-object.dto'; -import { InstallAddonListVo } from '../dtos/install-addon-list-vo.dto'; +import { InstallAddonListVo } from '../../../../entities/install-addon-list-vo.entity'; @Injectable() export class CloudBuildServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-group-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-group-service-impl.service.ts index 610ac980..d72a388a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-group-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-group-service-impl.service.ts @@ -9,7 +9,7 @@ import { SiteGroupListVo } from '../../../../dtos/admin/site/vo/site-group-list- import { SiteGroupAddParam } from '../../../../dtos/admin/site/param/site-group-add-param.dto'; import { SiteGroupParam } from '../../../../dtos/admin/site/param/site-group-param.dto'; import { JSONArray } from '../dtos/j-s-o-n-array.dto'; -import { InstallAddonListVo } from '../dtos/install-addon-list-vo.dto'; +import { InstallAddonListVo } from '../../../../entities/install-addon-list-vo.entity'; @Injectable() export class SiteGroupServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-service-impl.service.ts index 66ee5dd4..d1161fa8 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-service-impl.service.ts @@ -13,8 +13,8 @@ import { SysUserRoleParam } from '../../../../dtos/admin/sys/param/sys-user-role import { SiteEditParam } from '../../../../dtos/admin/site/param/site-edit-param.dto'; import { Class } from '../dtos/class.dto'; import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; -import { Site } from '../dtos/site.dto'; -import { SiteGroup } from '../dtos/site-group.dto'; +import { Site } from '../../../../entities/site.entity'; +import { SiteGroup } from '../../../../entities/site-group.entity'; import { ShowAppListVo } from '../../../../dtos/admin/site/vo/show-app-list-vo.dto'; import { SpecialMenuListVo } from '../../../../dtos/admin/site/vo/special-menu-list-vo.dto'; import { MenuVo } from '../dtos/menu-vo.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-service-impl.service.ts index 94b66863..c8530949 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-service-impl.service.ts @@ -11,7 +11,7 @@ import { SysPrinterParam } from '../../../../dtos/admin/sys/param/sys-printer-pa import { SysPrinterAddPrinterYlyParam } from '../../../../dtos/core/sys/param/sys-printer-add-printer-yly-param.dto'; import { SysPrinterModifyStatusParam } from '../../../../dtos/admin/sys/param/sys-printer-modify-status-param.dto'; import { SysPrinterPrintTicketParam } from '../../../../dtos/core/sys/param/sys-printer-print-ticket-param.dto'; -import { SysPrinter } from '../dtos/sys-printer.dto'; +import { SysPrinter } from '../../../../entities/sys-printer.entity'; @Injectable() export class SysPrinterServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-schedule-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-schedule-service-impl.service.ts index b6c6868f..8657d4ad 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-schedule-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-schedule-service-impl.service.ts @@ -13,7 +13,7 @@ import { SysScheduleParam } from '../../../../dtos/admin/sys/param/sys-schedule- import { SysScheduleTemplateVo } from '../../../../dtos/admin/sys/vo/sys-schedule-template-vo.dto'; import { SysScheduleLogSearchParam } from '../../../../dtos/admin/sys/param/sys-schedule-log-search-param.dto'; import { SysScheduleLogListVo } from '../../../../dtos/admin/sys/vo/sys-schedule-log-list-vo.dto'; -import { SysScheduleLog } from '../dtos/sys-schedule-log.dto'; +import { SysScheduleLog } from '../../../../entities/sys-schedule-log.entity'; @Injectable() export class SysScheduleServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-config-service-impl.service.ts index 16e50333..06aff06a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-config-service-impl.service.ts @@ -4,9 +4,9 @@ import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto'; import { WeappConfigParam } from '../../../../dtos/core/weapp/param/weapp-config-param.dto'; -import { SetDomainParam } from '../dtos/set-domain-param.dto'; +import { SetDomainParam } from '../../../../entities/set-domain-param.entity'; import { JSONObject } from '../dtos/j-s-o-n-object.dto'; -import { SceneDomainVo } from '../dtos/scene-domain-vo.dto'; +import { SceneDomainVo } from '../../../../entities/scene-domain-vo.entity'; @Injectable() export class WeappConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-config-service-impl.service.ts index 62ed2bd2..189350d6 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-config-service-impl.service.ts @@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { WechatConfigParam } from '../../../../dtos/core/wechat/param/wechat-config-param.dto'; -import { SceneDomainVo } from '../dtos/scene-domain-vo.dto'; +import { SceneDomainVo } from '../../../../entities/scene-domain-vo.entity'; import { WechatStaticInfoVo } from '../../../../dtos/admin/wechat/vo/wechat-static-info-vo.dto'; @Injectable() diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/weapp-version-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/weapp-version-service-impl.service.ts index da05833c..1ec8ac54 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/weapp-version-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/weapp-version-service-impl.service.ts @@ -7,7 +7,7 @@ import { WxOplatfromWeappVersionVo } from '../../../../dtos/admin/wxoplatform/vo import { PageParam } from '../../../../dtos/page-param.dto'; import { OplatformConfigVo } from '../../../../dtos/admin/wxoplatform/vo/oplatform-config-vo.dto'; import { WeappUploadParam } from '../../../../dtos/core/weapp/param/weapp-upload-param.dto'; -import { WxOplatfromWeappVersion } from '../dtos/wx-oplatfrom-weapp-version.dto'; +import { WxOplatfromWeappVersion } from '../../../../entities/wx-oplatfrom-weapp-version.entity'; import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto'; import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; import { SiteGroupWeappVersionVo } from '../../../../dtos/admin/wxoplatform/vo/site-group-weapp-version-vo.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-form-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-form-service-impl.service.ts index ccc7b1e8..f570362d 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-form-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-form-service-impl.service.ts @@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { DiyFormInfoVo } from '../../../../dtos/api/diy/vo/diy-form-info-vo.dto'; -import { DiyFormWriteConfig } from '../dtos/diy-form-write-config.dto'; +import { DiyFormWriteConfig } from '../../../../entities/diy-form-write-config.entity'; import { DiyFormRecordsParam } from '../../../../dtos/core/diy_form/param/diy-form-records-param.dto'; import { DiyFormRecordsInfoVo } from '../../../../dtos/core/diy_form/vo/diy-form-records-info-vo.dto'; import { DiyFormSubmitConfigInfoVo } from '../../../../dtos/core/diy_form/vo/diy-form-submit-config-info-vo.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/login-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/login-service-impl.service.ts index 75c2ae4d..186cd8c2 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/login-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/login-service-impl.service.ts @@ -7,7 +7,7 @@ import { AccountLoginParam } from '../../../../dtos/api/login/param/account-logi import { MobileLoginParam } from '../../../../dtos/api/login/param/mobile-login-param.dto'; import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto'; import { MobileRegisterParam } from '../../../../dtos/api/login/param/mobile-register-param.dto'; -import { Member } from '../dtos/member.dto'; +import { Member } from '../../../../entities/member.entity'; import { LoginVo } from '../../../../dtos/api/login/vo/login-vo.dto'; import { ResetPasswordParam } from '../../../../dtos/api/login/param/reset-password-param.dto'; import { SendMobileCodeParam } from '../../../../dtos/api/login/param/send-mobile-code-param.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/register-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/register-service-impl.service.ts index efb69b58..47af0910 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/register-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/register-service-impl.service.ts @@ -5,7 +5,7 @@ import { QueueService, EventBus, Result, CommonUtils, RequestContextService } fr import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto'; import { AccountRegisterParam } from '../../../../dtos/api/login/param/account-register-param.dto'; import { MobileRegisterParam } from '../../../../dtos/api/login/param/mobile-register-param.dto'; -import { Member } from '../dtos/member.dto'; +import { Member } from '../../../../entities/member.entity'; import { MobileCodeCacheVo } from '../../../../dtos/api/login/vo/mobile-code-cache-vo.dto'; @Injectable() diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-address-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-address-service-impl.service.ts index d24c44ab..72688ba3 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-address-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-address-service-impl.service.ts @@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; import { MemberAddressAddParam } from '../../../../dtos/api/member/param/member-address-add-param.dto'; -import { MemberAddress } from '../dtos/member-address.dto'; +import { MemberAddress } from '../../../../entities/member-address.entity'; import { MemberAddressDeleteParam } from '../../../../dtos/api/member/param/member-address-delete-param.dto'; import { MemberAddressEditParam } from '../../../../dtos/api/member/param/member-address-edit-param.dto'; import { MemberAddressGetInfoParam } from '../../../../dtos/api/member/param/member-address-get-info-param.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-area-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-area-service-impl.service.ts index 23ab256b..1c40cb1e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-area-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-area-service-impl.service.ts @@ -6,7 +6,7 @@ import { SysAreaListVo } from '../../../../dtos/api/sys/vo/sys-area-list-vo.dto' import { SysAreaLevelVo } from '../../../../dtos/api/sys/vo/sys-area-level-vo.dto'; import { Map } from '../dtos/list>.dto'; -import { SysArea } from '../dtos/sys-area.dto'; +import { SysArea } from '../../../../entities/sys-area.entity'; import { SysAreaAddressByLatlngParam } from '../../../../dtos/api/sys/param/sys-area-address-by-latlng-param.dto'; import { SysMapVo } from '../../../../dtos/admin/sys/vo/sys-map-vo.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-config-service-impl.service.ts index 9a712d27..73996306 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-config-service-impl.service.ts @@ -4,7 +4,7 @@ import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; import { SysConfigCopyrightParam } from '../../../../dtos/api/sys/param/sys-config-copyright-param.dto'; import { SysConfigSiteParam } from '../../../../dtos/api/sys/param/sys-config-site-param.dto'; -import { SysConfigSceneDomainParam } from '../dtos/sys-config-scene-domain-param.dto'; +import { SysConfigSceneDomainParam } from '../../../../entities/sys-config-scene-domain-param.entity'; import { SysConfigMapParam } from '../../../../dtos/api/sys/param/sys-config-map-param.dto'; @Injectable() diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-service-impl.service.ts index 5f348a99..50a8a697 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-service-impl.service.ts @@ -4,7 +4,7 @@ import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService } from '@wwjBoot'; import * as fs from 'fs'; import { CoreAddonSearchParam } from '../../../../dtos/core/addon/param/core-addon-search-param.dto'; -import { Addon } from '../dtos/addon.dto'; +import { Addon } from '../../../../entities/addon.entity'; @Injectable() export class CoreAddonServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/aliapp/impl/core-aliapp-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/aliapp/impl/core-aliapp-config-service-impl.service.ts index 96ebcfaf..5b388078 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/aliapp/impl/core-aliapp-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/aliapp/impl/core-aliapp-config-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; import { AliappConfigVo } from '../../../../dtos/core/aliapp/vo/aliapp-config-vo.dto'; import { AliappConfigParam } from '../../../../dtos/core/aliapp/param/aliapp-config-param.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-service-impl.service.ts index 272262be..d4fd500b 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; import { AppConfigVo } from '../../../../dtos/core/channel/vo/app-config-vo.dto'; import { SetAppParam } from '../../../../dtos/core/channel/param/set-app-param.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-h5-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-h5-service-impl.service.ts index af1ee767..5160c866 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-h5-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-h5-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from '@wwjBoot'; -import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; import { H5ConfigVo } from '../../../../dtos/core/channel/vo/h5-config-vo.dto'; import { SetH5Param } from '../../../../dtos/core/channel/param/set-h5-param.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-pc-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-pc-service-impl.service.ts index c1eed909..ae2e9160 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-pc-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-pc-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from '@wwjBoot'; -import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; import { PcConfigVo } from '../../../../dtos/core/channel/vo/pc-config-vo.dto'; import { SetPcParam } from '../../../../dtos/core/channel/param/set-pc-param.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-cash-out-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-cash-out-service-impl.service.ts index e3d0bc94..f3014017 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-cash-out-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-cash-out-service-impl.service.ts @@ -4,8 +4,8 @@ import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils } from '@wwjBoot'; import { MemberCashOutApplyParam } from '../../../../dtos/core/member/param/member-cash-out-apply-param.dto'; import { CashOutConfigVo } from '../../../../dtos/admin/member/vo/cash-out-config-vo.dto'; -import { MemberCashOut } from '../dtos/member-cash-out.dto'; -import { Member } from '../dtos/member.dto'; +import { MemberCashOut } from '../../../../entities/member-cash-out.entity'; +import { Member } from '../../../../entities/member.entity'; import { MemberCashOutAuditParam } from '../../../../dtos/admin/member/param/member-cash-out-audit-param.dto'; import { CashOutTransferParam } from '../../../../dtos/admin/member/param/cash-out-transfer-param.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-sms-log-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-sms-log-service-impl.service.ts index 544cc02a..1127cf6c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-sms-log-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-sms-log-service-impl.service.ts @@ -4,7 +4,7 @@ import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; import { PageParam } from '../../../../dtos/page-param.dto'; import { SysNoticeSmsLogSearchParam } from '../../../../dtos/core/notice/param/sys-notice-sms-log-search-param.dto'; -import { SysNoticeSmsLog } from '../dtos/sys-notice-sms-log.dto'; +import { SysNoticeSmsLog } from '../../../../entities/sys-notice-sms-log.entity'; @Injectable() export class CoreNoticeSmsLogServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-service-impl.service.ts index d105bde9..98359736 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-service-impl.service.ts @@ -9,9 +9,9 @@ import { HttpServletResponse } from '../dtos/http-servlet-response.dto'; import { PayNotifyParam } from '../../../../dtos/common/loader/pay/param/pay-notify-param.dto'; import { GetInfoByTradeVo } from '../../../../dtos/core/pay/vo/get-info-by-trade-vo.dto'; import { PayTypeVo } from '../../../../dtos/core/pay/vo/pay-type-vo.dto'; -import { Pay } from '../dtos/pay.dto'; +import { Pay } from '../../../../entities/pay.entity'; import { SysPrinterPrintTicketParam } from '../../../../dtos/core/sys/param/sys-printer-print-ticket-param.dto'; -import { ChannelEnum } from '../dtos/channel.dto'; +import { ChannelEnum } from '../../../../enums/channel.enum'; import { BigDecimal } from '../dtos/big-decimal.dto'; @Injectable() diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-refund-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-refund-service-impl.service.ts index a1340239..fcc90404 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-refund-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-refund-service-impl.service.ts @@ -6,7 +6,7 @@ import { @Validated } from '../dtos/@-validated.dto'; import { PayRefundTransferParam } from '../../../../dtos/core/pay/param/pay-refund-transfer-param.dto'; import { RefundParam } from '../../../../dtos/common/loader/pay/param/refund-param.dto'; import { RefundNotifyParam } from '../../../../dtos/common/loader/pay/param/refund-notify-param.dto'; -import { PayRefund } from '../dtos/pay-refund.dto'; +import { PayRefund } from '../../../../entities/pay-refund.entity'; @Injectable() export class CoreRefundServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-transfer-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-transfer-service-impl.service.ts index cc1dacb3..f61a8f65 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-transfer-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-transfer-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { PayTransfer } from '../dtos/pay-transfer.dto'; +import { PayTransfer } from '../../../../entities/pay-transfer.entity'; import { Map } from '../dtos/object>.dto'; import { TransferParam } from '../../../../dtos/common/loader/pay/param/transfer-param.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-account-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-account-service-impl.service.ts index 31b8033c..e1273e89 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-account-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-account-service-impl.service.ts @@ -2,9 +2,9 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result } from '@wwjBoot'; -import { Pay } from '../dtos/pay.dto'; -import { PayRefund } from '../dtos/pay-refund.dto'; -import { PayTransfer } from '../dtos/pay-transfer.dto'; +import { Pay } from '../../../../entities/pay.entity'; +import { PayRefund } from '../../../../entities/pay-refund.entity'; +import { PayTransfer } from '../../../../entities/pay-transfer.entity'; @Injectable() export class CoreSiteAccountServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-config-service-impl.service.ts index 90b29b8d..9cc1a167 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-config-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils } from '@wwjBoot'; -import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; import { JSON } from '../dtos/j-s-o-n.dto'; @Injectable() diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-export-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-export-service-impl.service.ts index 84b0c3f8..47cf97e0 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-export-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-export-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable, BadRequestException } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils } from '@wwjBoot'; -import { SysExport } from '../dtos/sys-export.dto'; +import { SysExport } from '../../../../entities/sys-export.entity'; import { SysExportParam } from '../../../../dtos/core/sys/param/sys-export-param.dto'; import { JSONObject } from '../dtos/j-s-o-n-object.dto'; import { PageParam } from '../../../../dtos/page-param.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-printer-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-printer-service-impl.service.ts index 09468061..f0943419 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-printer-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-printer-service-impl.service.ts @@ -3,9 +3,9 @@ import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; import { JSON } from '../dtos/j-s-o-n.dto'; -import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; import { SysPrinterAddPrinterYlyParam } from '../../../../dtos/core/sys/param/sys-printer-add-printer-yly-param.dto'; -import { SysPrinter } from '../dtos/sys-printer.dto'; +import { SysPrinter } from '../../../../entities/sys-printer.entity'; import { SysPrinterPrintTicketParam } from '../../../../dtos/core/sys/param/sys-printer-print-ticket-param.dto'; import { SysPrinterPrintTicketVo } from '../../../../dtos/core/sys/vo/sys-printer-print-ticket-vo.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-sys-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-sys-config-service-impl.service.ts index a46bc7c4..f737687c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-sys-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-sys-config-service-impl.service.ts @@ -15,7 +15,7 @@ import { JSONObject } from '../dtos/j-s-o-n-object.dto'; import { SysLoginConfigVo } from '../../../../dtos/admin/sys/vo/sys-login-config-vo.dto'; import { SysLoginConfigParam } from '../../../../dtos/admin/sys/param/sys-login-config-param.dto'; import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto'; -import { SceneDomainVo } from '../dtos/scene-domain-vo.dto'; +import { SceneDomainVo } from '../../../../entities/scene-domain-vo.entity'; @Injectable() export class CoreSysConfigServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-upload-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-upload-service-impl.service.ts index b2132665..f30442a8 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-upload-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-upload-service-impl.service.ts @@ -4,7 +4,7 @@ import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, CommonUtils } from '@wwjBoot'; import { AttachmentUploadParam } from '../../../../dtos/admin/sys/param/attachment-upload-param.dto'; import { AttachmentUploadVo } from '../../../../dtos/admin/sys/vo/attachment-upload-vo.dto'; -import { UploadModelResult } from '../dtos/upload-model-result.dto'; +import { UploadModelResult } from '../../../../entities/upload-model-result.entity'; @Injectable() export class CoreUploadServiceImplService { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-config-service-impl.service.ts index bbda3d9e..dbcc34c2 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-config-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto'; import { WeappConfigParam } from '../../../../dtos/core/weapp/param/weapp-config-param.dto'; import { WxOpenAuthorizerInfoResult } from '../dtos/wx-open-authorizer-info-result.dto'; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wechat/impl/core-wechat-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wechat/impl/core-wechat-config-service-impl.service.ts index a8a9de68..71959451 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wechat/impl/core-wechat-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/wechat/impl/core-wechat-config-service-impl.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; -import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto'; +import { CoreSysConfigVo } from '../../../../entities/core-sys-config-vo.entity'; import { WechatConfigVo } from '../../../../dtos/core/wechat/vo/wechat-config-vo.dto'; import { WechatConfigParam } from '../../../../dtos/core/wechat/param/wechat-config-param.dto'; import { WxOpenAuthorizerInfoResult } from '../dtos/wx-open-authorizer-info-result.dto';