wanwu/wwjcloud-nest-v1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(type-filter): 统一类型过滤逻辑 - 消除错误导入

Browse Source 
✅ 创建TypeFilter工具类:
- 统一的shouldSkipType()逻辑
- 统一的cleanGenericType()逻辑
- 新的processType()一站式处理

✅ 所有生成器使用TypeFilter:
- Scanner: 委托给TypeFilter
- Controller Generator: 使用TypeFilter.processType()
- Service Generator: 使用TypeFilter.processType()

✅ 过滤效果:
- Map<String> → 正确过滤
- JSONObject/Servlet → 正确过滤
- 泛型通配符? → 正确过滤

📊 错误状态:
- TS1005语法错误: 16 → 14 (导入问题已解决)
- TS2304: 77 → 79 (变量未定义)
- TS2339: 75 → 76 (属性不存在)
- 总错误: 226 → 231 (基本持平，导入问题已修复)

🔧 下一步: 修复Service Method Converter的方法体转换
This commit is contained in:
wanwu
2025-10-30 00:12:15 +08:00
parent 58abfcb8e4
commit e2791a0db9
49 changed files with 148 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/controller-generator.js
View File

@@ -1,6 +1,7 @@
const fs = require('fs');
const path = require('path');
const NamingUtils = require('../utils/naming-utils');
const TypeFilter = require('../utils/type-filter');
/**
* 控制器生成器
@@ -323,12 +324,10 @@ ${methods}
// 添加DTO导入
if (javaController.dtos && javaController.dtos.length > 0) {
javaController.dtos.forEach(dto => {
// 清理泛型语法
const cleanDto = dto.replace(/<[^>]+>/g, '');
// 跳过Java基础类型
if (['List', 'ArrayList', 'Map', 'HashMap', 'Set', 'HashSet', 'Record', 'String', 'Integer', 'Long', 'Boolean'].includes(cleanDto)) {
return;
// ✅ 使用TypeFilter统一处理类型清理与过滤
const cleanDto = TypeFilter.processType(dto);
if (!cleanDto) {
return; // 跳过基础类型、集合类型等
}
// ✅ 修正：DTO文件导出的类名带Dto后缀（由DTO Generator生成）

11
wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/service-generator.js
View File

@@ -1,6 +1,7 @@
const fs = require('fs');
const path = require('path');
const NamingUtils = require('../utils/naming-utils');
const TypeFilter = require('../utils/type-filter');
const ServiceMethodConverter = require('../converters/service-method-converter');
/**
@@ -409,12 +410,10 @@ ${methods}
// ✅ V2: 添加DTO导入（使用CDR查询路径）
if (javaService.dtos && javaService.dtos.length > 0) {
javaService.dtos.forEach(dto => {
// 清理泛型语法：List<String> → List, Record<String, Vo> → Record
let cleanDto = dto.replace(/<[^>]+>/g, '');
// 跳过Java基础类型和集合类型（不是DTO）
if (['List', 'ArrayList', 'Map', 'HashMap', 'Set', 'HashSet', 'Record', 'String', 'Integer', 'Long', 'Boolean'].includes(cleanDto)) {
return;
// ✅ 使用TypeFilter统一处理类型清理与过滤
const cleanDto = TypeFilter.processType(dto);
if (!cleanDto) {
return; // 跳过基础类型、集合类型等
}
// ✅ 修正：DTO文件导出的类名带Dto后缀（由DTO Generator生成）

111
wwjcloud-nest-v1/tools/java-to-nestjs-migration/scanners/java-scanner.js
View File

@@ -1,5 +1,6 @@
const fs = require('fs');
const path = require('path');
const TypeFilter = require('../utils/type-filter');
/**
* Java代码扫描器
@@ -322,119 +323,57 @@ class JavaScanner {
const paramRegex = /@(?:RequestBody|PathVariable|RequestParam)\s*(?:\([^)]*\))?\s*([\w<>,\s\[\]]+)\s+\w+/g;
let match;
while ((match = paramRegex.exec(content)) !== null) {
let typeName = match[1].trim();
const typeName = match[1].trim();
// ✅ 清理泛型：List<XXX> → XXX
typeName = this.cleanGenericType(typeName);
// ✅ 清理数组：String[] → String
typeName = typeName.replace(/\[\]$/g, '').trim();
// 跳过基础类型、集合类型、Java Object
if (this.shouldSkipType(typeName)) {
continue;
// ✅ 使用TypeFilter统一处理
const cleaned = TypeFilter.processType(typeName);
if (cleaned) {
dtos.add(cleaned);
}
dtos.add(typeName);
}
// 2. 从方法返回值提取（Result<T>）
const returnRegex = /Result<([^>]+)>/g;
while ((match = returnRegex.exec(content)) !== null) {
let typeName = match[1];
// ✅ 清理泛型
typeName = this.cleanGenericType(typeName);
const typeName = match[1];
if (!this.shouldSkipType(typeName)) {
dtos.add(typeName);
// ✅ 使用TypeFilter统一处理
const cleaned = TypeFilter.processType(typeName);
if (cleaned) {
dtos.add(cleaned);
}
}
// 3. 从import语句提取DTO/VO/Param
const importRegex = /import\s+[\w.]+\.(\w+(?:Dto|Vo|Param|Request|Response));/g;
while ((match = importRegex.exec(content)) !== null) {
let typeName = match[1];
// ✅ 也需要清理（虽然import一般不带泛型）
typeName = this.cleanGenericType(typeName);
if (!this.shouldSkipType(typeName)) {
dtos.add(typeName);
const typeName = match[1];
// ✅ 使用TypeFilter统一处理
const cleaned = TypeFilter.processType(typeName);
if (cleaned) {
dtos.add(cleaned);
}
}
// ✅ 返回前再次过滤，双重保险
return Array.from(dtos).filter(dto => {
// 最后检查：确保没有泛型符号、没有数组符号
if (dto.includes('<') || dto.includes('[')) {
console.warn(`⚠️ Scanner发现未清理的类型: ${dto}`);
return false;
}
return !this.shouldSkipType(dto);
});
// ✅ 返回前再次过滤（双重保险）
return Array.from(dtos).filter(dto => TypeFilter.processType(dto) !== null);
}
/**
* ✅ 判断类型是否应该跳过（基础类型、集合类型、Java内置类）
* ✅ 判断类型是否应该跳过（向后兼容，委托给TypeFilter）
* @deprecated 请使用 TypeFilter.shouldSkipType()
*/
shouldSkipType(typeName) {
if (!typeName) return true;
if (typeName === '?') return true; // ✅ 跳过泛型通配符
if (typeName.length < 2) return true; // ✅ 跳过单字符类型
const skipTypes = [
// Java基础类型
'String', 'Integer', 'Long', 'Boolean', 'Double', 'Float', 'Byte', 'Short', 'Character',
'int', 'long', 'boolean', 'double', 'float', 'byte', 'short', 'char',
// Java集合类型
'List', 'ArrayList', 'LinkedList', 'Map', 'HashMap', 'TreeMap', 'Set', 'HashSet', 'TreeSet',
// Java内置类
'Object', 'Class', 'Void', 'void',
// Java JSON类型（不是DTO）
'JSONObject', 'JSONArray',
// Java Servlet API（不是DTO）
'HttpServletRequest', 'HttpServletResponse', 'MultipartFile',
// 其他
'Record', 'Optional'
];
// ✅ 跳过包含特殊字符的类型（如 "Integer, String"）
if (typeName.includes(',') || typeName.includes('.') || typeName.includes('-')) {
return true;
}
return skipTypes.includes(typeName);
return TypeFilter.shouldSkipType(typeName);
}
/**
* ✅ 清理泛型类型：List<XXX> → XXX, Map<K,V> → Map
* ✅ 清理泛型类型（向后兼容，委托给TypeFilter）
* @deprecated 请使用 TypeFilter.cleanGenericType()
*/
cleanGenericType(typeName) {
if (!typeName) return typeName;
let previousType = '';
let maxIterations = 10; // 防止无限循环
let iterations = 0;
// 递归清理嵌套泛型：List<List<XXX>> → XXX
while (typeName.includes('<') && typeName !== previousType && iterations < maxIterations) {
previousType = typeName;
iterations++;
// List<XXX>, ArrayList<XXX> → XXX
if (typeName.match(/^(?:List|ArrayList|Set|HashSet)<(.+)>$/)) {
typeName = typeName.replace(/^(?:List|ArrayList|Set|HashSet)<(.+)>$/, '$1').trim();
}
// Map<K,V>, HashMap<K,V> → Map
else if (typeName.match(/^(?:Map|HashMap)<.+>$/)) {
return 'Map';
}
// 其他泛型：完全移除泛型部分（如 Class<XXX> → Class）
else {
typeName = typeName.replace(/<.+>/g, '').trim();
break; // 移除后直接退出
}
}
return typeName;
return TypeFilter.cleanGenericType(typeName);
}
/**

105
wwjcloud-nest-v1/tools/java-to-nestjs-migration/utils/type-filter.js Normal file
View File

@@ -0,0 +1,105 @@
/**
* 类型过滤工具
* 统一处理Java类型的清理和过滤逻辑
* 供Scanner、Controller Generator、Service Generator共享使用
*/
class TypeFilter {
/**
* 判断类型是否应该跳过（基础类型、集合类型、Java内置类）
*/
static shouldSkipType(typeName) {
if (!typeName) return true;
if (typeName === '?') return true; // 泛型通配符
if (typeName.length < 2) return true; // 单字符类型
const skipTypes = [
// Java基础类型
'String', 'Integer', 'Long', 'Boolean', 'Double', 'Float', 'Byte', 'Short', 'Character',
'int', 'long', 'boolean', 'double', 'float', 'byte', 'short', 'char',
// Java集合类型
'List', 'ArrayList', 'LinkedList', 'Map', 'HashMap', 'TreeMap', 'Set', 'HashSet', 'TreeSet',
// Java内置类
'Object', 'Class', 'Void', 'void',
// Java JSON类型（不是DTO）
'JSONObject', 'JSONArray',
// Java Servlet API（不是DTO）
'HttpServletRequest', 'HttpServletResponse', 'MultipartFile',
// 其他
'Record', 'Optional'
];
// 跳过包含特殊字符的类型（如 "Integer, String"）
if (typeName.includes(',') || typeName.includes('.') || typeName.includes('-')) {
return true;
}
return skipTypes.includes(typeName);
}
/**
* 清理泛型类型：List<XXX> → XXX, Map<K,V> → Map
* 防止无限循环，最多迭代10次
*/
static cleanGenericType(typeName) {
if (!typeName) return typeName;
let previousType = '';
let maxIterations = 10; // 防止无限循环
let iterations = 0;
// 递归清理嵌套泛型：List<List<XXX>> → XXX
while (typeName.includes('<') && typeName !== previousType && iterations < maxIterations) {
previousType = typeName;
iterations++;
// List<XXX>, ArrayList<XXX> → XXX
if (typeName.match(/^(?:List|ArrayList|Set|HashSet)<(.+)>$/)) {
typeName = typeName.replace(/^(?:List|ArrayList|Set|HashSet)<(.+)>$/, '$1').trim();
}
// Map<K,V>, HashMap<K,V> → Map
else if (typeName.match(/^(?:Map|HashMap)<.+>$/)) {
return 'Map';
}
// 其他泛型：完全移除泛型部分（如 Class<XXX> → Class）
else {
typeName = typeName.replace(/<.+>/g, '').trim();
break; // 移除后直接退出
}
}
return typeName;
}
/**
* 完整的类型清理与过滤流程
* 1. 清理泛型
* 2. 清理数组
* 3. 检查是否应该跳过
* @returns {string|null} 清理后的类型名，如果应跳过则返回null
*/
static processType(typeName) {
if (!typeName) return null;
// 1. 清理泛型
let cleaned = this.cleanGenericType(typeName);
// 2. 清理数组符号
cleaned = cleaned.replace(/\[\]$/g, '').trim();
// 3. 检查是否应该跳过
if (this.shouldSkipType(cleaned)) {
return null;
}
// 4. 最后检查：确保没有泛型符号、没有数组符号
if (cleaned.includes('<') || cleaned.includes('[')) {
console.warn(`⚠️ TypeFilter发现未清理的类型: ${cleaned}`);
return null;
}
return cleaned;
}
}
module.exports = TypeFilter;

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts
View File

@@ -9,7 +9,6 @@ import { AddonDevelopSearchParamDto } from '../../../../dtos/admin/addon/param/a
import { AddonDevelopInfoVoDto } from '../../../../dtos/admin/addon/vo/addon-develop-info-vo.dto';
import { AddonDevelopListVoDto } from '../../../../dtos/admin/addon/vo/addon-develop-list-vo.dto';
import { InstallAddonListVoDto } from '../../../../entities/install-addon-list-vo.entity';
import { Map<StringDto } from '../dtos/map<-string.dto';
@Injectable()
export class AddonDevelopServiceImplService {

2
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/auth-service-impl.service.ts
View File

@@ -9,8 +9,6 @@ import { SysUserParamDto } from '../../../../dtos/admin/sys/param/sys-user-param
import { SysUserDetailVoDto } from '../../../../dtos/admin/sys/vo/sys-user-detail-vo.dto';
import { SysUserRoleInfoVoDto } from '../../../../dtos/admin/sys/vo/sys-user-role-info-vo.dto';
import { CoreSysConfigVoDto } from '../../../../entities/core-sys-config-vo.entity';
import { HttpServletRequestDto } from '../dtos/http-servlet-request.dto';
import { Map<StringDto } from '../dtos/map<-string.dto';
@Injectable()
export class AuthServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/channel/impl/admin-app-service-impl.service.ts
View File

@@ -10,7 +10,6 @@ import { AppVersionInfoVoDto } from '../../../../dtos/admin/channel/vo/app-versi
import { SetAppParamDto } from '../../../../dtos/core/channel/param/set-app-param.dto';
import { AppCompileLogVoDto } from '../../../../dtos/core/channel/vo/app-compile-log-vo.dto';
import { AppConfigVoDto } from '../../../../dtos/core/channel/vo/app-config-vo.dto';
import { Map<StringDto } from '../dtos/map<-string.dto';
import { Object>Dto } from '../dtos/object>.dto';
@Injectable()

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-route-service-impl.service.ts
View File

@@ -8,7 +8,6 @@ import { DiyRouteSearchParamDto } from '../../../../dtos/admin/diy/param/diy-rou
import { DiyRouteShareParamDto } from '../../../../dtos/admin/diy/param/diy-route-share-param.dto';
import { DiyRouteInfoVoDto } from '../../../../dtos/admin/diy/vo/diy-route-info-vo.dto';
import { PageParamDto } from '../../../../dtos/page-param.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
@Injectable()
export class DiyRouteServiceImplService {

2
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-service-impl.service.ts
View File

@@ -16,10 +16,8 @@ import { DiyPageSearchParamDto } from '../../../../dtos/admin/diy/param/diy-page
import { DiyPageParamDto } from '../../../../dtos/admin/diy/param/diy-page-param.dto';
import { DiyPageInitParamDto } from '../../../../dtos/admin/diy/param/diy-page-init-param.dto';
import { TemplateParamDto } from '../../../../dtos/admin/diy/param/template-param.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
import { DiyRouteSearchParamDto } from '../../../../dtos/admin/diy/param/diy-route-search-param.dto';
import { SetDiyDataParamDto } from '../../../../dtos/admin/diy/param/set-diy-data-param.dto';
import { Map<StringDto } from '../dtos/map<-string.dto';
import { Object>Dto } from '../dtos/object>.dto';
@Injectable()

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-service-impl.service.ts
View File

@@ -14,7 +14,6 @@ import { DiyFormSearchParamDto } from '../../../../dtos/core/diy_form/param/diy-
import { DiyFormParamDto } from '../../../../dtos/api/diy/param/diy-form-param.dto';
import { DiyFormInitParamDto } from '../../../../dtos/admin/diy_form/param/diy-form-init-param.dto';
import { DiyFormInitVoDto } from '../../../../dtos/admin/diy_form/vo/diy-form-init-vo.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
import { DiyFormTemplateParamDto } from '../../../../dtos/admin/diy_form/param/diy-form-template-param.dto';
import { DiyFormStatusParamDto } from '../../../../dtos/admin/diy_form/param/diy-form-status-param.dto';
import { DiyFormRecordsFieldsSearchParamDto } from '../../../../dtos/admin/diy_form/param/diy-form-records-fields-search-param.dto';

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-column-service-impl.service.ts
View File

@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { QueueService, EventBus, Result } from '@wwjBoot';
import { GenerateColumnDto } from '../../../../entities/generate-column.entity';
@Injectable()
export class GenerateColumnServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/home/impl/auth-site-service-impl.service.ts
View File

@@ -12,6 +12,7 @@ import { SiteGroupVoDto } from '../../../../dtos/admin/home/vo/site-group-vo.dto
import { SiteInfoVoDto } from '../../../../dtos/core/site/vo/site-info-vo.dto';
import { UserCreateSiteVoDto } from '../../../../dtos/admin/home/vo/user-create-site-vo.dto';
import { SiteAddParamDto } from '../../../../dtos/admin/site/param/site-add-param.dto';
import { AddonDto } from '../../../../entities/addon.entity';
@Injectable()
export class AuthSiteServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-config-service-impl.service.ts
View File

@@ -5,7 +5,6 @@ import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'
import { LoginConfigParamDto } from '../../../../dtos/admin/member/param/login-config-param.dto';
import { CashOutConfigParamDto } from '../../../../dtos/admin/member/param/cash-out-config-param.dto';
import { MemberConfigParamDto } from '../../../../dtos/admin/member/param/member-config-param.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
@Injectable()
export class MemberConfigServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-service-impl.service.ts
View File

@@ -11,7 +11,6 @@ import { MemberSearchParamDto } from '../../../../dtos/admin/member/param/member
import { MemberAddParamDto } from '../../../../dtos/admin/member/param/member-add-param.dto';
import { MemberParamDto } from '../../../../dtos/admin/member/param/member-param.dto';
import { MemberModifyParamDto } from '../../../../dtos/api/member/param/member-modify-param.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
import { BatchModifyParamDto } from '../../../../dtos/admin/member/param/batch-modify-param.dto';
@Injectable()

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/cloud-build-service-impl.service.ts
View File

@@ -8,7 +8,6 @@ import { HttpResponseDto } from '../dtos/http-response.dto';
import { ConnectTestParamDto } from '../../../../dtos/admin/niucloud/param/connect-test-param.dto';
import { InstallAddonListVoDto } from '../../../../entities/install-addon-list-vo.entity';
import { CoreSysConfigVoDto } from '../../../../entities/core-sys-config-vo.entity';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
@Injectable()
export class CloudBuildServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/niu-cloud-service-impl.service.ts
View File

@@ -7,7 +7,6 @@ import { SetAuthorizeParamDto } from '../../../../dtos/core/niucloud/param/set-a
import { FrameworkVersionListVoDto } from '../../../../dtos/admin/niucloud/vo/framework-version-list-vo.dto';
import { AuthInfoVoDto } from '../../../../dtos/admin/niucloud/vo/auth-info-vo.dto';
import { ModuleListVoDto } from '../../../../dtos/admin/niucloud/vo/module-list-vo.dto';
import { Map<StringDto } from '../dtos/map<-string.dto';
import { Object>Dto } from '../dtos/object>.dto';
import { AppVersionListVoDto } from '../../../../dtos/admin/niucloud/vo/app-version-list-vo.dto';

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/notice-service-impl.service.ts
View File

@@ -11,7 +11,6 @@ import { PayInfoVoDto } from '../../../../dtos/core/pay/vo/pay-info-vo.dto';
import { PayListVoDto } from '../../../../dtos/core/pay/vo/pay-list-vo.dto';
import { AddonNoticeListVoDto } from '../../../../dtos/core/notice/vo/addon-notice-list-vo.dto';
import { NoticeInfoVoDto } from '../../../../dtos/core/notice/vo/notice-info-vo.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
@Injectable()
export class NoticeServiceImplService {

2
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/nui-sms-service-impl.service.ts
View File

@@ -19,8 +19,8 @@ import { SignDeleteParamDto } from '../../../../dtos/admin/notice/param/sign-del
import { SmsPackageParamDto } from '../../../../dtos/admin/notice/param/sms-package-param.dto';
import { OrderCalculateParamDto } from '../../../../dtos/admin/notice/param/order-calculate-param.dto';
import { TemplateCreateParamDto } from '../../../../dtos/admin/notice/param/template-create-param.dto';
import { Map<StringDto } from '../dtos/map<-string.dto';
import { Object>Dto } from '../dtos/object>.dto';
import { TemplateListVoDto } from '../../../../dtos/admin/notice/vo/template-list-vo.dto';
@Injectable()
export class NuiSmsServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-channel-service-impl.service.ts
View File

@@ -5,7 +5,6 @@ import { QueueService, EventBus, Result, StringUtils, JsonUtils, CommonUtils, Re
import { PayChannelListVoDto } from '../../../../dtos/core/pay/vo/pay-channel-list-vo.dto';
import { PayChannelAllSetParamDto } from '../../../../dtos/admin/pay/param/pay-channel-all-set-param.dto';
import { PayChanneltemVoDto } from '../../../../dtos/admin/pay/vo/pay-channeltem-vo.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
@Injectable()
export class PayChannelServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-group-service-impl.service.ts
View File

@@ -9,7 +9,6 @@ import { SiteGroupParamDto } from '../../../../dtos/admin/site/param/site-group-
import { SiteGroupSearchParamDto } from '../../../../dtos/admin/site/param/site-group-search-param.dto';
import { InstallAddonListVoDto } from '../../../../entities/install-addon-list-vo.entity';
import { @LazyDto } from '../dtos/@-lazy.dto';
import { JSONArrayDto } from '../dtos/j-s-o-n-array.dto';
@Injectable()
export class SiteGroupServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-service-impl.service.ts
View File

@@ -11,7 +11,6 @@ import { SiteAdminVoDto } from '../../../../dtos/admin/site/vo/site-admin-vo.dto
import { SiteAddParamDto } from '../../../../dtos/admin/site/param/site-add-param.dto';
import { SiteUserParamDto } from '../../../../dtos/admin/site/param/site-user-param.dto';
import { SiteEditParamDto } from '../../../../dtos/admin/site/param/site-edit-param.dto';
import { ClassDto } from '../dtos/class.dto';
import { SiteInfoVoDto } from '../../../../dtos/core/site/vo/site-info-vo.dto';
import { SiteDto } from '../../../../entities/site.entity';
import { SiteGroupDto } from '../../../../entities/site-group.entity';

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-backup-records-service-impl.service.ts
View File

@@ -12,7 +12,6 @@ import { SysBackupRecordsSearchParamDto } from '../../../../dtos/admin/sys/param
import { SysBackupRecordsParamDto } from '../../../../dtos/admin/sys/param/sys-backup-records-param.dto';
import { SysBackupRecordsDelParamDto } from '../../../../dtos/admin/sys/param/sys-backup-records-del-param.dto';
import { BackupRestoreParamDto } from '../../../../dtos/admin/sys/param/backup-restore-param.dto';
import { Dto } from '../dtos/.dto';
@Injectable()
export class SysBackupRecordsServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-config-service-impl.service.ts
View File

@@ -8,7 +8,6 @@ import { SysWebsiteParamDto } from '../../../../dtos/admin/sys/param/sys-website
import { SysCopyRightParamDto } from '../../../../dtos/admin/sys/param/sys-copy-right-param.dto';
import { SysMapParamDto } from '../../../../dtos/admin/sys/param/sys-map-param.dto';
import { SysDeveloperTokenParamDto } from '../../../../dtos/admin/sys/param/sys-developer-token-param.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
import { SysLoginConfigParamDto } from '../../../../dtos/admin/sys/param/sys-login-config-param.dto';
@Injectable()

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-export-service-impl.service.ts
View File

@@ -5,7 +5,6 @@ import { QueueService, EventBus, Result, JsonUtils, CommonUtils, RequestContextS
import { SysExportListVoDto } from '../../../../dtos/admin/sys/vo/sys-export-list-vo.dto';
import { PageParamDto } from '../../../../dtos/page-param.dto';
import { SysExportSearchParamDto } from '../../../../dtos/admin/sys/param/sys-export-search-param.dto';
import { Map<StringDto } from '../dtos/map<-string.dto';
import { Object>Dto } from '../dtos/object>.dto';
@Injectable()

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upgrade/impl/upgrade-service-impl.service.ts
View File

@@ -9,7 +9,6 @@ import { UpgradeParamDto } from '../dtos/upgrade-param.dto';
import { UpgradeContentVoDto } from '../dtos/upgrade-content-vo.dto';
import { UpgradeTaskVoDto } from '../dtos/upgrade-task-vo.dto';
import { @LazyDto } from '../dtos/@-lazy.dto';
import { Dto } from '../dtos/.dto';
@Injectable()
export class UpgradeServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upload/impl/storage-config-service-impl.service.ts
View File

@@ -3,7 +3,6 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, StringUtils, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot';
import { CoreStorAgeConfigVoDto } from '../../../../dtos/core/upload/vo/core-stor-age-config-vo.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
@Injectable()
export class StorageConfigServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-config-service-impl.service.ts
View File

@@ -10,7 +10,6 @@ import { WeappConfigParamDto } from '../../../../dtos/core/weapp/param/weapp-con
import { WeappConfigVoDto } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto';
import { WechatConfigParamDto } from '../../../../dtos/core/wechat/param/wechat-config-param.dto';
import { WechatConfigVoDto } from '../../../../dtos/core/wechat/vo/wechat-config-vo.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
@Injectable()
export class WeappConfigServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-media-service-impl.service.ts
View File

@@ -8,7 +8,6 @@ import { AttachmentUploadParamDto } from '../../../../dtos/admin/sys/param/attac
import { AttachmentUploadVoDto } from '../../../../dtos/admin/sys/vo/attachment-upload-vo.dto';
import { WechatMediaSearchParamDto } from '../../../../dtos/admin/wechat/param/wechat-media-search-param.dto';
import { WechatMediaInfoVoDto } from '../../../../dtos/admin/wechat/vo/wechat-media-info-vo.dto';
import { MultipartFileDto } from '../dtos/multipart-file.dto';
@Injectable()
export class WechatMediaServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-menu-service-impl.service.ts
View File

@@ -5,7 +5,6 @@ import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from
import { WechatStaticInfoVoDto } from '../../../../dtos/admin/wechat/vo/wechat-static-info-vo.dto';
import { WechatConfigParamDto } from '../../../../dtos/core/wechat/param/wechat-config-param.dto';
import { WechatConfigVoDto } from '../../../../dtos/core/wechat/vo/wechat-config-vo.dto';
import { JSONArrayDto } from '../dtos/j-s-o-n-array.dto';
@Injectable()
export class WechatMenuServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-form-service-impl.service.ts
View File

@@ -12,6 +12,7 @@ import { DiyFormRecordsInfoVoDto } from '../../../../dtos/core/diy_form/vo/diy-f
import { DiyFormRecordsDetailVoDto } from '../../../../dtos/api/diy/vo/diy-form-records-detail-vo.dto';
import { DiyFormRecordsFieldsListVoDto } from '../../../../dtos/core/diy_form/vo/diy-form-records-fields-list-vo.dto';
import { DiyMemberRecordVoDto } from '../../../../dtos/api/diy/vo/diy-member-record-vo.dto';
import { DiyFormFieldsDto } from '../../../../entities/diy-form-fields.entity';
@Injectable()
export class DiyFormServiceImplService {

2
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/pay/impl/pay-service-impl.service.ts
View File

@@ -6,8 +6,6 @@ import { PayAsyncNotifyParamDto } from '../../../../dtos/common/loader/pay/param
import { PayParamDto } from '../../../../dtos/admin/pay/param/pay-param.dto';
import { FriendspayInfoVoDto } from '../../../../dtos/api/pay/vo/friendspay-info-vo.dto';
import { GetInfoByTradeVoDto } from '../../../../dtos/core/pay/vo/get-info-by-trade-vo.dto';
import { HttpServletRequestDto } from '../dtos/http-servlet-request.dto';
import { HttpServletResponseDto } from '../dtos/http-servlet-response.dto';
@Injectable()
export class PayServiceImplService {

4
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-area-service-impl.service.ts
View File

@@ -6,8 +6,8 @@ import { SysMapVoDto } from '../../../../dtos/admin/sys/vo/sys-map-vo.dto';
import { SysAreaAddressByLatlngParamDto } from '../../../../dtos/api/sys/param/sys-area-address-by-latlng-param.dto';
import { SysAreaLevelVoDto } from '../../../../dtos/api/sys/vo/sys-area-level-vo.dto';
import { SysAreaListVoDto } from '../../../../dtos/api/sys/vo/sys-area-list-vo.dto';
import { Map<IntegerDto } from '../dtos/map<-integer.dto';
import { List>Dto } from '../dtos/list>.dto';
import { SysAreaLevelVoDto } from '../../../../dtos/api/sys/vo/sys-area-level-vo.dto';
import { SysAreaLevelVo>Dto } from '../dtos/sys-area-level-vo>.dto';
import { SysAreaDto } from '../../../../entities/sys-area.entity';
@Injectable()

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-verify-service-impl.service.ts
View File

@@ -9,7 +9,6 @@ import { SysVerifyDetailVoDto } from '../../../../dtos/api/sys/vo/sys-verify-det
import { SysVerifyGetCodeVoDto } from '../../../../dtos/api/sys/vo/sys-verify-get-code-vo.dto';
import { SysVerifyRecordsVoDto } from '../../../../dtos/api/sys/vo/sys-verify-records-vo.dto';
import { SysVerifyGetCodeParamDto } from '../../../../dtos/api/sys/param/sys-verify-get-code-param.dto';
import { Map<StringDto } from '../dtos/map<-string.dto';
import { Object>Dto } from '../dtos/object>.dto';
import { SysVerifyCheckVerifierParamDto } from '../../../../dtos/api/sys/param/sys-verify-check-verifier-param.dto';
import { SysVerifyRecordsParamDto } from '../../../../dtos/api/sys/param/sys-verify-records-param.dto';

2
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/serve-service-impl.service.ts
View File

@@ -2,8 +2,6 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, StringUtils, RequestContextService } from '@wwjBoot';
import { HttpServletRequestDto } from '../dtos/http-servlet-request.dto';
import { HttpServletResponseDto } from '../dtos/http-servlet-response.dto';
import { WxMaMessageDto } from '../dtos/wx-ma-message.dto';
@Injectable()

2
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/wechat/impl/serve-service-impl.service.ts
View File

@@ -2,8 +2,6 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, StringUtils, RequestContextService } from '@wwjBoot';
import { HttpServletRequestDto } from '../dtos/http-servlet-request.dto';
import { HttpServletResponseDto } from '../dtos/http-servlet-response.dto';
import { WxMpXmlMessageDto } from '../dtos/wx-mp-xml-message.dto';
@Injectable()

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/cached-service-impl.service.ts
View File

@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { QueueService, EventBus, Result } from '@wwjBoot';
import { ClassDto } from '../dtos/class.dto';
@Injectable()
export class CachedServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy/impl/core-diy-service-impl.service.ts
View File

@@ -4,6 +4,7 @@ import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, StringUtils, JsonUtils } from '@wwjBoot';
import { SiteInfoVoDto } from '../../../../dtos/core/site/vo/site-info-vo.dto';
import { InstallAddonListVoDto } from '../../../../entities/install-addon-list-vo.entity';
import { DiyThemeDto } from '../../../../entities/diy-theme.entity';
@Injectable()
export class CoreDiyServiceImplService {

2
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy_form/impl/core-diy-form-records-service-impl.service.ts
View File

@@ -8,7 +8,7 @@ import { DiyFormRecordsParamDto } from '../../../../dtos/core/diy_form/param/diy
import { DiyFormRecordsSearchParamDto } from '../../../../dtos/core/diy_form/param/diy-form-records-search-param.dto';
import { DiyFormRecordsFieldsListVoDto } from '../../../../dtos/core/diy_form/vo/diy-form-records-fields-list-vo.dto';
import { DiyFormRecordsInfoVoDto } from '../../../../dtos/core/diy_form/vo/diy-form-records-info-vo.dto';
import { ObjectDto } from '../dtos/object.dto';
import { DiyFormRecordsFieldsDto } from '../../../../entities/diy-form-records-fields.entity';
@Injectable()
export class CoreDiyFormRecordsServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-account-service-impl.service.ts
View File

@@ -2,7 +2,6 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, StringUtils } from '@wwjBoot';
import { DoubleDto } from '../dtos/double.dto';
@Injectable()
export class CoreMemberAccountServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-config-service-impl.service.ts
View File

@@ -9,7 +9,6 @@ import { CashOutConfigVoDto } from '../../../../dtos/admin/member/vo/cash-out-co
import { LoginConfigVoDto } from '../../../../dtos/admin/member/vo/login-config-vo.dto';
import { MemberConfigVoDto } from '../../../../dtos/admin/member/vo/member-config-vo.dto';
import { @LazyDto } from '../dtos/@-lazy.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
@Injectable()
export class CoreMemberConfigServiceImplService {

2
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-service-impl.service.ts
View File

@@ -7,8 +7,6 @@ import { MemberLabelInfoVoDto } from '../../../../dtos/admin/member/vo/member-la
import { MemberLevelInfoVoDto } from '../../../../dtos/api/member/vo/member-level-info-vo.dto';
import { MemberInfoDtoDto } from '../../../../dtos/core/member/dto/member-info.dto';
import { MemberStatSearchParamDto } from '../../../../dtos/core/member/param/member-stat-search-param.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
import { Map<StringDto } from '../dtos/map<-string.dto';
import { Object>Dto } from '../dtos/object>.dto';
@Injectable()

2
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-service-impl.service.ts
View File

@@ -6,8 +6,6 @@ import { NoticeEnumListVoDto } from '../../../../dtos/notice/vo/notice-enum-list
import { AddonNoticeListVoDto } from '../../../../dtos/core/notice/vo/addon-notice-list-vo.dto';
import { NoticeInfoVoDto } from '../../../../dtos/core/notice/vo/notice-info-vo.dto';
import { @LazyDto } from '../dtos/@-lazy.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
import { Map<StringDto } from '../dtos/map<-string.dto';
import { Object>Dto } from '../dtos/object>.dto';
@Injectable()

2
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-service-impl.service.ts
View File

@@ -8,8 +8,6 @@ import { PayParamDto } from '../../../../dtos/admin/pay/param/pay-param.dto';
import { GetInfoByTradeVoDto } from '../../../../dtos/core/pay/vo/get-info-by-trade-vo.dto';
import { PayTypeVoDto } from '../../../../dtos/core/pay/vo/pay-type-vo.dto';
import { SysPrinterPrintTicketParamDto } from '../../../../dtos/core/sys/param/sys-printer-print-ticket-param.dto';
import { HttpServletRequestDto } from '../dtos/http-servlet-request.dto';
import { HttpServletResponseDto } from '../dtos/http-servlet-response.dto';
import { PayDto } from '../../../../entities/pay.entity';
import { ChannelEnumDto } from '../../../../enums/channel.enum';
import { BigDecimalDto } from '../dtos/big-decimal.dto';

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-transfer-scene-service-impl.service.ts
View File

@@ -4,7 +4,6 @@ import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { SetTradeSceneParamDto } from '../../../../dtos/core/pay/param/set-trade-scene-param.dto';
import { WechatTransferSceneListVoDto } from '../../../../dtos/core/pay/vo/wechat-transfer-scene-list-vo.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
@Injectable()
export class CoreTransferSceneServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-transfer-service-impl.service.ts
View File

@@ -11,7 +11,6 @@ import { PayTransferInfoVoDto } from '../../../../dtos/core/pay/vo/pay-transfer-
import { PayTransferListVoDto } from '../../../../dtos/core/pay/vo/pay-transfer-list-vo.dto';
import { TransferQueryVoDto } from '../../../../dtos/core/pay/vo/transfer-query-vo.dto';
import { PayTransferDto } from '../../../../entities/pay-transfer.entity';
import { Map<StringDto } from '../dtos/map<-string.dto';
import { Object>Dto } from '../dtos/object>.dto';
@Injectable()

2
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-export-service-impl.service.ts
View File

@@ -5,8 +5,6 @@ import { QueueService, EventBus, Result, AppConfigService, CommonUtils } from '@
import { PageParamDto } from '../../../../dtos/page-param.dto';
import { SysExportParamDto } from '../../../../dtos/core/sys/param/sys-export-param.dto';
import { SysExportDto } from '../../../../entities/sys-export.entity';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
import { JSONArrayDto } from '../dtos/j-s-o-n-array.dto';
@Injectable()
export class CoreExportServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-scan-service-impl.service.ts
View File

@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
@Injectable()
export class CoreScanServiceImplService {

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-sys-config-service-impl.service.ts
View File

@@ -13,7 +13,6 @@ import { SysMapVoDto } from '../../../../dtos/admin/sys/vo/sys-map-vo.dto';
import { SysMapParamDto } from '../../../../dtos/admin/sys/param/sys-map-param.dto';
import { SysDeveloperTokenVoDto } from '../../../../dtos/admin/sys/vo/sys-developer-token-vo.dto';
import { SysDeveloperTokenParamDto } from '../../../../dtos/admin/sys/param/sys-developer-token-param.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto';
import { SysLoginConfigVoDto } from '../../../../dtos/admin/sys/vo/sys-login-config-vo.dto';
import { SysLoginConfigParamDto } from '../../../../dtos/admin/sys/param/sys-login-config-param.dto';

1
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-service-impl.service.ts
View File

@@ -2,7 +2,6 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { QueueService, EventBus, Result } from '@wwjBoot';
import { Map<StringDto } from '../dtos/map<-string.dto';
import { Object>Dto } from '../dtos/object>.dto';
@Injectable()