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

feat(cdr): 修复CDR路径推断逻辑 - 编译错误减少98.3%

Browse Source 
核心修复:
- 类名映射: Java类名本身带后缀，不再重复添加
- 路径计算: fromPath文件路径转目录路径
- Service路径: 添加services/前缀
- CDR查询: 629个类型正确查询

效果: 14086→241个错误 (-98.3%)
This commit is contained in:
wanwu
2025-10-29 23:25:21 +08:00
parent 3c87db45ff
commit 5079f4c768
155 changed files with 1010 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wwjcloud-nest-v1/tools/java-to-nestjs-migration/central-data-repository.js
View File

@@ -285,11 +285,22 @@ class CentralDataRepository {
inferImportPath(typeName, fromPath) { inferImportPath(typeName, fromPath) {
const location = this.getTypeLocation(typeName); const location = this.getTypeLocation(typeName);
if (!location) { if (!location) {
console.warn(`⚠️ CDR.inferImportPath: 类型 "${typeName}" 未找到`);
return null; return null;
} }
// ✅ 修复：fromPath是文件路径，需要先转为目录路径
// 例如: "services/admin/member/impl/member-service-impl.service.ts" → "services/admin/member/impl"
let fromDir = fromPath;
if (fromPath.includes('.ts') || fromPath.includes('.js')) {
// 去掉文件名，只保留目录
const parts = fromPath.split('/');
parts.pop(); // 移除最后的文件名
fromDir = parts.join('/');
}
// 计算相对路径 // 计算相对路径
const from = fromPath.split('/').filter(p => p); const from = fromDir.split('/').filter(p => p);
const to = location.relativePath.split('/').filter(p => p); const to = location.relativePath.split('/').filter(p => p);
// 找到公共前缀 // 找到公共前缀
@@ -308,8 +319,19 @@ class CentralDataRepository {
const relativePath = '../'.repeat(upLevels) + downPath.join('/'); 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 后缀 // 移除 .ts 后缀
return relativePath.replace('.ts', ''); return relativePath.replace(/\.ts$/, '');
} }
/** /**

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

@@ -187,9 +187,11 @@ export class CommonModule {}
*/ */
generateServiceModule(serviceModule) { generateServiceModule(serviceModule) {
console.log('📋 生成服务模块...'); console.log('📋 生成服务模块...');
console.log(`🔍 Service components: ${serviceModule.components ? serviceModule.components.length : 0} 个`);
// 生成具体的服务文件 // 生成具体的服务文件
if (serviceModule.components && serviceModule.components.length > 0) { if (serviceModule.components && serviceModule.components.length > 0) {
console.log(`🔧 开始生成${serviceModule.components.length}个Service...`);
serviceModule.components.forEach(service => { serviceModule.components.forEach(service => {
const serviceDir = path.join(this.outputDir, 'services'); const serviceDir = path.join(this.outputDir, 'services');
if (!fs.existsSync(serviceDir)) { if (!fs.existsSync(serviceDir)) {
@@ -467,15 +469,18 @@ export class ControllerModule {
// ✅ V2: 记录DTO位置到CDR // ✅ V2: 记录DTO位置到CDR
if (this.cdr && result) { if (this.cdr && result) {
const dtoName = result.dtoName || this.namingUtils.generateDtoName(dtoComponent.javaClass.className); // ⚠️ 使用原始Java类名作为key，而不是generateDtoName生成的名称
// 因为Service Generator查询时使用的是原始Java类名
const originalClassName = dtoComponent.javaClass.className;
const relativePath = result.relativePath || `dtos/${result.fileName}`; const relativePath = result.relativePath || `dtos/${result.fileName}`;
const category = this.inferDtoCategory(dtoComponent.javaClass.className); const category = this.inferDtoCategory(originalClassName);
this.cdr.setTypeLocation(dtoName, { this.cdr.setTypeLocation(originalClassName, {
relativePath, relativePath,
absolutePath: result.absolutePath || path.join(dtoDir, result.fileName), absolutePath: result.absolutePath || path.join(dtoDir, result.fileName),
category, category,
module: dtoComponent.javaClass.module || 'common' module: dtoComponent.javaClass.module || 'common',
generatedName: result.dtoName // 保留生成的名称供参考
}); });
} }
} catch (error) { } catch (error) {

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

@@ -52,6 +52,10 @@ class ServiceGenerator {
const fileName = this.namingUtils.generateFileName(javaService.className, 'service'); const fileName = this.namingUtils.generateFileName(javaService.className, 'service');
const filePath = path.join(fullOutputDir, fileName); const filePath = path.join(fullOutputDir, fileName);
// ✅ V2: 保存生成的NestJS文件路径到javaService，供CDR使用
// 注意：需要包含'services/'前缀，因为outputDir是src/，而DTO在src/dtos/
javaService.nestjsFilePath = path.join('services', subDir, fileName); // 相对于src/的路径
// ✅ 修复：检查Service是否已实现，不覆盖已实现的Service // ✅ 修复：检查Service是否已实现，不覆盖已实现的Service
if (fs.existsSync(filePath)) { if (fs.existsSync(filePath)) {
const existingContent = fs.readFileSync(filePath, 'utf-8'); const existingContent = fs.readFileSync(filePath, 'utf-8');
@@ -322,6 +326,12 @@ ${methods}
* ✅ 增强：接收额外的imports（NestJS异常、Node.js模块、Boot服务） * ✅ 增强：接收额外的imports（NestJS异常、Node.js模块、Boot服务）
*/ */
generateImports(javaService, additionalImports = {}) { generateImports(javaService, additionalImports = {}) {
// 调试：检查CDR状态（临时）
if (!this._cdrDebugPrinted) {
console.log(`🔍 Service Generator.generateImports: this.cdr = ${this.cdr ? 'PRESENT' : 'NULL'}`);
this._cdrDebugPrinted = true;
}
const imports = [ const imports = [
"import { Injectable } from '@nestjs/common';" "import { Injectable } from '@nestjs/common';"
]; ];
@@ -413,14 +423,21 @@ ${methods}
return; return;
} }
const dtoName = this.namingUtils.generateDtoName(cleanDto); // ✅ 修正：Java类名本身就带Dto/Vo/Param后缀，不需要再加
// import语句中的类名应该直接使用Java类名（PascalCase）
const typeName = this.namingUtils.toPascalCase(cleanDto);
// ✅ V2: 使用CDR查询DTO路径（如果可用） // ✅ V2: 使用CDR查询DTO路径（如果可用）
let importPath = null; let importPath = null;
if (this.cdr) { if (this.cdr) {
// 从当前Service文件路径推断相对路径 // ⚠️ 关键：使用生成的NestJS文件路径，而不是Java源文件路径
const currentPath = javaService.filePath || 'services/admin'; const currentPath = javaService.nestjsFilePath || javaService.filePath || 'services/admin';
importPath = this.cdr.inferImportPath(dtoName, currentPath); importPath = this.cdr.inferImportPath(cleanDto, currentPath);
} else {
// 调试：CDR未注入
if (cleanDto === 'PageParam' || cleanDto === 'MemberInfoDto') {
console.warn(`⚠️ Service Generator: this.cdr is null for ${cleanDto}!`);
}
} }
// ⚠️ 兜底：如果CDR未找到，使用旧的硬编码路径 // ⚠️ 兜底：如果CDR未找到，使用旧的硬编码路径
@@ -429,7 +446,7 @@ ${methods}
importPath = `../dtos/${dtoFileName.replace('.ts', '')}`; importPath = `../dtos/${dtoFileName.replace('.ts', '')}`;
} }
imports.push(`import { ${dtoName} } from '${importPath}';`); imports.push(`import { ${typeName} } from '${importPath}';`);
}); });
} }

12
wwjcloud-nest-v1/tools/java-to-nestjs-migration/migration-coordinator.js
View File

@@ -68,6 +68,18 @@ class JavaToNestJSMigrationCoordinator {
console.log(''); console.log('');
this.cdr.printStats(); 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 // ✅ V2: 测试查询几个DTO
console.log('\n🔍 测试CDR查询:'); console.log('\n🔍 测试CDR查询:');
const testTypes = ['MemberInfoDto', 'MemberListVo', 'PageParam', 'MemberSearchParam']; const testTypes = ['MemberInfoDto', 'MemberListVo', 'PageParam', 'MemberSearchParam'];

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

@@ -4,9 +4,12 @@ import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils } from '@wwjBoot';
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import { AddonDevelopSearchParamDto } from '../dtos/addon-develop-search-param.dto'; import { AddonDevelopSearchParam } from '../../../../dtos/admin/addon/param/addon-develop-search-param.dto';
import { AddonDevelopAddParamDto } from '../dtos/addon-develop-add-param.dto'; import { AddonDevelopListVo } from '../../../../dtos/admin/addon/vo/addon-develop-list-vo.dto';
import { Map<StringDto } from '../dtos/map<-string.dto'; import { InstallAddonListVo } from '../dtos/install-addon-list-vo.dto';
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<String } from '../dtos/map<-string.dto';
@Injectable() @Injectable()
export class AddonDevelopServiceImplService { export class AddonDevelopServiceImplService {
@@ -23,11 +26,11 @@ export class AddonDevelopServiceImplService {
try { try {
// 获取已安装的插件 // 获取已安装的插件
const installAddonList: Record<String, InstallAddonListVo> = this.coreAddonService.installAddonList; const installAddonList: Record<string, InstallAddonListVo> = this.coreAddonService.installAddonList;
// 获取本地所有的插件 // 获取本地所有的插件
const localAddons: string[] = fs.readdirSync(this.appConfig.webRootDownAddon) const localAddons: string[] = fs.readdirSync(this.appConfig.webRootDownAddon)
.map(path => path.toFile()) .map(path => path)
.filter(file => fs.statSync(file).isDirectory()) .filter(file => fs.statSync(file).isDirectory())
; ;

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

@@ -2,9 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result } from '@wwjBoot'; import { QueueService, EventBus, Result } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { AddonLogSearchParamDto } from '../dtos/addon-log-search-param.dto'; import { AddonLogSearchParam } from '../../../../dtos/admin/addon/param/addon-log-search-param.dto';
import { AddonLogParamDto } from '../dtos/addon-log-param.dto'; import { AddonLogListVo } from '../../../../dtos/admin/addon/vo/addon-log-list-vo.dto';
import { AddonLogInfoVo } from '../../../../dtos/admin/addon/vo/addon-log-info-vo.dto';
import { AddonLogParam } from '../../../../dtos/admin/addon/param/addon-log-param.dto';
@Injectable() @Injectable()
export class AddonLogServiceImplService { export class AddonLogServiceImplService {

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

@@ -4,11 +4,17 @@ import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, AppConfigService } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService } from '@wwjBoot';
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import { PageParamDto } from '../dtos/page-param.dto'; import { LocalAddonListVo } from '../../../../dtos/admin/addon/vo/local-addon-list-vo.dto';
import { AddonSearchParamDto } from '../dtos/addon-search-param.dto'; import { LocalAddonInfoVo } from '../../../../dtos/admin/addon/vo/local-addon-info-vo.dto';
import { AddonParamDto } from '../dtos/addon-param.dto'; import { InstallAddonListVo } from '../dtos/install-addon-list-vo.dto';
import { List<String>Dto } from '../dtos/list<-string>.dto'; import { ModuleListVo } from '../../../../dtos/admin/niucloud/vo/module-list-vo.dto';
import { IndexAddonListParamDto } from '../dtos/index-addon-list-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { AddonSearchParam } from '../../../../dtos/admin/addon/param/addon-search-param.dto';
import { AddonListVo } from '../../../../dtos/admin/addon/vo/addon-list-vo.dto';
import { AddonInfoVo } from '../../../../dtos/admin/addon/vo/addon-info-vo.dto';
import { AddonParam } from '../../../../dtos/admin/addon/param/addon-param.dto';
import { IndexAddonListParam } from '../../../../dtos/admin/addon/vo/index-addon-list-param.dto';
import { NiucloudConfigVo } from '../../../../dtos/core/niucloud/vo/niucloud-config-vo.dto';
@Injectable() @Injectable()
export class AddonServiceImplService { export class AddonServiceImplService {
@@ -23,7 +29,7 @@ export class AddonServiceImplService {
async getLocalAddonList(): Promise<any> { async getLocalAddonList(): Promise<any> {
const vo: LocalAddonListVo = new LocalAddonListVo(); const vo: LocalAddonListVo = new LocalAddonListVo();
const list: Record<String, LocalAddonInfoVo> = new const installAddonList: Record<>(); const list: Record<string, LocalAddonInfoVo> = new const installAddonList: Record<>();
// 获取已安装的插件 // 获取已安装的插件
Record<String, InstallAddonListVo> = this.this.CoreAddonService.installAddonList; Record<String, InstallAddonListVo> = this.this.CoreAddonService.installAddonList;
@@ -49,7 +55,7 @@ export class AddonServiceImplService {
// 获取本地所有的插件 // 获取本地所有的插件
const localAddons: string[] = fs.readdirSync(this.appConfig.webRootDownAddon) const localAddons: string[] = fs.readdirSync(this.appConfig.webRootDownAddon)
.map(path => path.toFile()) .map(path => path)
.filter(file => fs.statSync(file).isDirectory()) .filter(file => fs.statSync(file).isDirectory())
; ;
@@ -225,7 +231,7 @@ export class AddonServiceImplService {
async download(addon: string, version: string): Promise<any> { async download(addon: string, version: string): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.instance; const instance: NiucloudUtils = NiucloudUtils.instance;
const actionQuery: Record<String, Object> = new const query: Record<>(); const actionQuery: Record<string, Object> = new const query: Record<>();
actionQuery.put("data[app_key]", addon); actionQuery.put("data[app_key]", addon);
actionQuery.put("data[version]", version); actionQuery.put("data[version]", version);
actionQuery.put("data[product_key]", instance.productKey); actionQuery.put("data[product_key]", instance.productKey);
@@ -251,7 +257,7 @@ export class AddonServiceImplService {
try (const fos: FileOutputStream = new FileOutputStream(file)) { try (const fos: FileOutputStream = new FileOutputStream(file)) {
fos.write(response.bodyBytes()); fos.write(response.bodyBytes());
ZipUtil.unzip(file.path, this.appConfig.webRootDownAddon, Charset.forName(System.getProperty("sun.jnu.encoding"))); ZipUtil.unzip(file.path, this.appConfig.webRootDownAddon, Charset.forName('utf-8'));
} catch (e) { } catch (e) {
console.error(e); console.error(e);
throw new BadRequestException(e.message); throw new BadRequestException(e.message);
@@ -262,7 +268,7 @@ export class AddonServiceImplService {
* getIndexAddonList * getIndexAddonList
*/ */
async getIndexAddonList(param: IndexAddonListParam): Promise<any> { async getIndexAddonList(param: IndexAddonListParam): Promise<any> {
const params: Record<String, Object> = {}; const params: Record<string, Object> = {};
const config: NiucloudConfigVo = this.coreNiucloudConfigService.niucloudConfig; const config: NiucloudConfigVo = this.coreNiucloudConfigService.niucloudConfig;
params.put("code", config.authCode); params.put("code", config.authCode);
params.put("secret", config.authSecret); params.put("secret", config.authSecret);

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

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { AliappConfigParamDto } from '../dtos/aliapp-config-param.dto'; import { AliappConfigParam } from '../../../../dtos/core/aliapp/param/aliapp-config-param.dto';
@Injectable() @Injectable()
export class AliappConfigServiceImplService { export class AliappConfigServiceImplService {

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

@@ -2,10 +2,15 @@ import { Injectable, BadRequestException, UnauthorizedException } from '@nestjs/
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import * as path from 'path'; import { HttpServletRequest } from '../dtos/http-servlet-request.dto';
import { HttpServletRequestDto } from '../dtos/http-servlet-request.dto'; import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto';
import { EditAuthUserParamDto } from '../dtos/edit-auth-user-param.dto'; import { SysUserRoleInfoVo } from '../../../../dtos/admin/sys/vo/sys-user-role-info-vo.dto';
import { Map<StringDto } from '../dtos/map<-string.dto'; import { SysUserDetailVo } from '../../../../dtos/admin/sys/vo/sys-user-detail-vo.dto';
import { AuthUserInfoVo } from '../../../../dtos/admin/auth/vo/auth-user-info-vo.dto';
import { EditAuthUserParam } from '../../../../dtos/admin/auth/param/edit-auth-user-param.dto';
import { SysUserParam } from '../../../../dtos/admin/sys/param/sys-user-param.dto';
import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto';
import { Map<String } from '../dtos/map<-string.dto';
@Injectable() @Injectable()
export class AuthServiceImplService { export class AuthServiceImplService {
@@ -82,7 +87,7 @@ export class AuthServiceImplService {
//判断当前访问的接口是否收到权限的限制 //判断当前访问的接口是否收到权限的限制
if (is_exists < 0) { if (is_exists < 0) {
Map<String, String[]> otherMenuList = this.sysMenuService.getAllApiList(RequestUtils.appType() === AppTypeEnum.path.basename(ADMIN) ? AppTypeEnum.path.basename(SITE) : AppTypeEnum.path.basename(ADMIN), 100); Map<String, String[]> otherMenuList = this.sysMenuService.getAllApiList(RequestUtils.appType() === AppTypeEnum.basename(ADMIN) ? AppTypeEnum.basename(SITE) : AppTypeEnum.basename(ADMIN), 100);
const methodMenuList: string[] = otherMenuList.get(method); const methodMenuList: string[] = otherMenuList.get(method);
const is_method_exists: number = methodMenuList.indexOf(rule); const is_method_exists: number = methodMenuList.indexOf(rule);
if (is_method_exists > 0) { if (is_method_exists > 0) {

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

@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import * as path from 'path'; import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto';
import { LoginConfigParamDto } from '../dtos/login-config-param.dto'; import { LoginConfigParam } from '../../../../dtos/admin/member/param/login-config-param.dto';
@Injectable() @Injectable()
export class ConfigServiceImplService { export class ConfigServiceImplService {
@@ -17,7 +17,7 @@ export class ConfigServiceImplService {
*/ */
async getLoginConfig(): Promise<any> { async getLoginConfig(): Promise<any> {
const defaultSiteId: number = RequestUtils.defaultSiteId(); const defaultSiteId: number = RequestUtils.defaultSiteId();
const sysConfig: Record<string, any> = this.coreConfigService.getConfigValue(defaultSiteId, ConfigKeyEnum.path.basename(ADMIN_LOGIN)); const sysConfig: Record<string, any> = this.coreConfigService.getConfigValue(defaultSiteId, ConfigKeyEnum.basename(ADMIN_LOGIN));
return Object.assign(new LoginConfigVo(), sysConfig) /* TODO: 检查LoginConfigVo构造函数 */; return Object.assign(new LoginConfigVo(), sysConfig) /* TODO: 检查LoginConfigVo构造函数 */;
} }
@@ -30,6 +30,6 @@ export class ConfigServiceImplService {
jsonObject.set("is_site_captcha", loginConfigParam.isSiteCaptcha); jsonObject.set("is_site_captcha", loginConfigParam.isSiteCaptcha);
jsonObject.set("bg", loginConfigParam.bg); jsonObject.set("bg", loginConfigParam.bg);
jsonObject.set("site_bg", loginConfigParam.siteBg); jsonObject.set("site_bg", loginConfigParam.siteBg);
this.coreConfigService.config = this.requestContext.siteId, ConfigKeyEnum.path.basename(ADMIN_LOGIN, jsonObject); this.coreConfigService.config = this.requestContext.siteId, ConfigKeyEnum.basename(ADMIN_LOGIN, jsonObject);
} }
} }

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

@@ -2,8 +2,13 @@ import { Injectable, UnauthorizedException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import * as path from 'path'; import { UserLoginParam } from '../../../../dtos/admin/auth/param/user-login-param.dto';
import { UserLoginParamDto } from '../dtos/user-login-param.dto'; import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto';
import { SysUserInfoVo } from '../../../../dtos/admin/sys/vo/sys-user-info-vo.dto';
import { SysUserRoleInfoVo } from '../../../../dtos/admin/sys/vo/sys-user-role-info-vo.dto';
import { LoginResultVo } from '../../../../dtos/admin/auth/vo/login-result-vo.dto';
import { LoginUserInfoVo } from '../../../../dtos/admin/auth/vo/login-user-info-vo.dto';
import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto';
@Injectable() @Injectable()
export class LoginServiceImplService { export class LoginServiceImplService {
@@ -27,9 +32,9 @@ export class LoginServiceImplService {
const loginConfigVo: LoginConfigVo = this.configService.loginConfig; const loginConfigVo: LoginConfigVo = this.configService.loginConfig;
const isCaptcha: number = 0; const isCaptcha: number = 0;
if(appType === AppTypeEnum.path.basename(ADMIN)){ if(appType === AppTypeEnum.basename(ADMIN)){
isCaptcha=loginConfigVo.isCaptcha; isCaptcha=loginConfigVo.isCaptcha;
}else if(appType === AppTypeEnum.path.basename(SITE)){ }else if(appType === AppTypeEnum.basename(SITE)){
isCaptcha=loginConfigVo.isSiteCaptcha; isCaptcha=loginConfigVo.isSiteCaptcha;
} }
@@ -54,7 +59,7 @@ export class LoginServiceImplService {
const defaultSiteId: number = 0; const defaultSiteId: number = 0;
const roleInfoVo: SysUserRoleInfoVo = new SysUserRoleInfoVo(); const roleInfoVo: SysUserRoleInfoVo = new SysUserRoleInfoVo();
const siteIds: number[] = []; const siteIds: number[] = [];
if(appType === AppTypeEnum.path.basename(ADMIN)){ if(appType === AppTypeEnum.basename(ADMIN)){
defaultSiteId=RequestUtils.defaultSiteId(); defaultSiteId=RequestUtils.defaultSiteId();
roleInfoVo=this.sysUserRoleService.getUserRole(defaultSiteId, userInfo.uid); roleInfoVo=this.sysUserRoleService.getUserRole(defaultSiteId, userInfo.uid);
if(ObjectUtil.isNotNull(roleInfoVo)){ if(ObjectUtil.isNotNull(roleInfoVo)){
@@ -62,9 +67,9 @@ export class LoginServiceImplService {
throw new UnauthorizedException("账号被锁定"); throw new UnauthorizedException("账号被锁定");
} }
}else{ }else{
appType=AppTypeEnum.path.basename(SITE); appType=AppTypeEnum.basename(SITE);
} }
}else if(appType === AppTypeEnum.path.basename(SITE)){ }else if(appType === AppTypeEnum.basename(SITE)){
siteIds=this.authSiteService.siteIds; siteIds=this.authSiteService.siteIds;
if(ObjectUtil.isNotNull(siteIds) && siteIds.length>0){ if(ObjectUtil.isNotNull(siteIds) && siteIds.length>0){
defaultSiteId=siteIds.indexOf(this.requestContext.siteId)>0 || this.authService.isSuperAdmin()?this.requestContext.siteId:siteIds.get(0); defaultSiteId=siteIds.indexOf(this.requestContext.siteId)>0 || this.authService.isSuperAdmin()?this.requestContext.siteId:siteIds.get(0);
@@ -94,12 +99,12 @@ export class LoginServiceImplService {
userInfoVo.isSuperAdmin = this.authService.isSuperAdmin(); userInfoVo.isSuperAdmin = this.authService.isSuperAdmin();
if(appType === AppTypeEnum.path.basename(ADMIN) || (appType === AppTypeEnum.path.basename(SITE) && defaultSiteId>0)){ if(appType === AppTypeEnum.basename(ADMIN) || (appType === AppTypeEnum.basename(SITE) && defaultSiteId>0)){
RequestUtils.siteId = defaultSiteId; RequestUtils.siteId = defaultSiteId;
const siteInfoVo: SiteInfoVo = this.siteService.info(this.requestContext.siteId); const siteInfoVo: SiteInfoVo = this.siteService.info(this.requestContext.siteId);
resultVo.siteInfo = siteInfoVo; resultVo.siteInfo = siteInfoVo;
} }
if(appType === AppTypeEnum.path.basename(ADMIN) && !userInfoVo.isSuperAdmin){ if(appType === AppTypeEnum.basename(ADMIN) && !userInfoVo.isSuperAdmin){
siteIds=this.authSiteService.siteIds; siteIds=this.authSiteService.siteIds;
} }

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

@@ -2,12 +2,15 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { SetAppParamDto } from '../dtos/set-app-param.dto'; import { SetAppParam } from '../../../../dtos/core/channel/param/set-app-param.dto';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { AppVersionPageParamDto } from '../dtos/app-version-page-param.dto'; import { AppVersionPageParam } from '../../../../dtos/admin/channel/param/app-version-page-param.dto';
import { AppVersionAddParamDto } from '../dtos/app-version-add-param.dto'; import { AppVersionListVo } from '../../../../dtos/admin/niucloud/vo/app-version-list-vo.dto';
import { Map<StringDto } from '../dtos/map<-string.dto'; import { AppVersionInfoVo } from '../../../../dtos/admin/channel/vo/app-version-info-vo.dto';
import { Object>Dto } from '../dtos/object>.dto'; import { AppVersionAddParam } from '../../../../dtos/admin/channel/param/app-version-add-param.dto';
import { AppCompileLogVo } from '../../../../dtos/core/channel/vo/app-compile-log-vo.dto';
import { Map<String } from '../dtos/map<-string.dto';
import { Object> } from '../dtos/object>.dto';
@Injectable() @Injectable()
export class AdminAppServiceImplService { export class AdminAppServiceImplService {

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

@@ -3,9 +3,11 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils } from '@wwjBoot';
import * as path from 'path'; import * as path from 'path';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { DictSearchParamDto } from '../dtos/dict-search-param.dto'; import { DictSearchParam } from '../../../../dtos/admin/dict/param/dict-search-param.dto';
import { DictParamDto } from '../dtos/dict-param.dto'; import { DictListVo } from '../../../../dtos/admin/dict/vo/dict-list-vo.dto';
import { DictInfoVo } from '../../../../dtos/admin/dict/vo/dict-info-vo.dto';
import { DictParam } from '../../../../dtos/admin/dict/param/dict-param.dto';
@Injectable() @Injectable()
export class DictServiceImplService { export class DictServiceImplService {

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

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { SetBottomConfigParamDto } from '../dtos/set-bottom-config-param.dto'; import { SetBottomConfigParam } from '../../../../dtos/admin/diy/param/set-bottom-config-param.dto';
@Injectable() @Injectable()
export class DiyConfigServiceImplService { export class DiyConfigServiceImplService {

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

@@ -3,9 +3,11 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import * as path from 'path'; import * as path from 'path';
import { DiyRouteSearchParamDto } from '../dtos/diy-route-search-param.dto'; import { DiyRouteSearchParam } from '../../../../dtos/admin/diy/param/diy-route-search-param.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; import { DiyRouteListVo } from '../../../../dtos/admin/diy/vo/diy-route-list-vo.dto';
import { DiyRouteShareParamDto } from '../dtos/diy-route-share-param.dto'; import { JSONObject } from '../dtos/j-s-o-n-object.dto';
import { DiyRouteInfoVo } from '../../../../dtos/admin/diy/vo/diy-route-info-vo.dto';
import { DiyRouteShareParam } from '../../../../dtos/admin/diy/param/diy-route-share-param.dto';
@Injectable() @Injectable()
export class DiyRouteServiceImplService { export class DiyRouteServiceImplService {

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

@@ -3,16 +3,22 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, StringUtils, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, StringUtils, CommonUtils, RequestContextService } from '@wwjBoot';
import * as path from 'path'; import * as path from 'path';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { DiyPageSearchParamDto } from '../dtos/diy-page-search-param.dto'; import { DiyPageSearchParam } from '../../../../dtos/admin/diy/param/diy-page-search-param.dto';
import { DiyPageParamDto } from '../dtos/diy-page-param.dto'; import { DiyPageListVo } from '../../../../dtos/admin/diy/vo/diy-page-list-vo.dto';
import { DiyPageInitParamDto } from '../dtos/diy-page-init-param.dto'; import { DiyPageInfoVo } from '../../../../dtos/admin/diy/vo/diy-page-info-vo.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; import { DiyPageParam } from '../../../../dtos/admin/diy/param/diy-page-param.dto';
import { TemplateParamDto } from '../dtos/template-param.dto'; import { DiyPageInitParam } from '../../../../dtos/admin/diy/param/diy-page-init-param.dto';
import { StartUpPageConfigParamDto } from '../dtos/start-up-page-config-param.dto'; import { TemplateParam } from '../../../../dtos/admin/diy/param/template-param.dto';
import { SetDiyDataParamDto } from '../dtos/set-diy-data-param.dto'; import { StartUpPageConfigVo } from '../../../../dtos/core/diy/vo/start-up-page-config-vo.dto';
import { Map<StringDto } from '../dtos/map<-string.dto'; import { JSONObject } from '../dtos/j-s-o-n-object.dto';
import { Object>Dto } from '../dtos/object>.dto'; import { StartUpPageConfigParam } from '../../../../dtos/core/diy/param/start-up-page-config-param.dto';
import { DiyRouteSearchParam } from '../../../../dtos/admin/diy/param/diy-route-search-param.dto';
import { DiyRouteListVo } from '../../../../dtos/admin/diy/vo/diy-route-list-vo.dto';
import { SceneDomainVo } from '../dtos/scene-domain-vo.dto';
import { SetDiyDataParam } from '../../../../dtos/admin/diy/param/set-diy-data-param.dto';
import { Map<String } from '../dtos/map<-string.dto';
import { Object> } from '../dtos/object>.dto';
@Injectable() @Injectable()
export class DiyServiceImplService { export class DiyServiceImplService {
@@ -49,7 +55,7 @@ export class DiyServiceImplService {
.filter(temp => vo.type != null && vo.type === temp.get("type")) .filter(temp => vo.type != null && vo.type === temp.get("type"))
.findFirst() .findFirst()
.map(addon => ObjectUtil.defaultIfNull(addon.get("title"), "").toString()) .map(addon => ObjectUtil.defaultIfNull(addon.get("title"), "").toString())
.orElse(""); || "";
vo.addonName = addonName; vo.addonName = addonName;
list.push(vo); list.push(vo);
} }

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

@@ -2,10 +2,12 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot';
import { DiyThemeSetParamDto } from '../dtos/diy-theme-set-param.dto'; import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto';
import { DiyThemeColorParamDto } from '../dtos/diy-theme-color-param.dto'; import { DiyThemeSetParam } from '../../../../dtos/admin/diy/param/diy-theme-set-param.dto';
import { DiyThemeParamDto } from '../dtos/diy-theme-param.dto'; import { DiyThemeColorParam } from '../../../../dtos/admin/diy/param/diy-theme-color-param.dto';
import { DiyThemeTitleParamDto } from '../dtos/diy-theme-title-param.dto'; import { DiyThemeInfoVo } from '../../../../dtos/admin/diy/vo/diy-theme-info-vo.dto';
import { DiyThemeParam } from '../../../../dtos/admin/diy/param/diy-theme-param.dto';
import { DiyThemeTitleParam } from '../../../../dtos/admin/diy/param/diy-theme-title-param.dto';
@Injectable() @Injectable()
export class DiyThemeServiceImplService { export class DiyThemeServiceImplService {
@@ -21,7 +23,7 @@ export class DiyThemeServiceImplService {
const siteId: number = this.requestContext.siteId; const siteId: number = this.requestContext.siteId;
const siteCache: SiteInfoVo = this.coreSiteService.getSiteCache(siteId); const siteCache: SiteInfoVo = this.coreSiteService.getSiteCache(siteId);
const themeDataList: DiyTheme[] = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("type", "app").eq("is_selected", 1)); const themeDataList: DiyTheme[] = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("type", "app").eq("is_selected", 1));
const themeData: Record<String, DiyTheme> = {}; const themeData: Record<string, DiyTheme> = {};
if ((themeDataList && themeDataList.length > 0)){ if ((themeDataList && themeDataList.length > 0)){
themeData = themeDataList.collect(/* Collectors已删除 */.toMap(theme => theme.addon, theme => theme)); themeData = themeDataList.collect(/* Collectors已删除 */.toMap(theme => theme.addon, theme => theme));
} }

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

@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { DiyFormWriteConfigParamDto } from '../dtos/diy-form-write-config-param.dto'; import { DiyFormWriteConfigParam } from '../../../../dtos/core/diy_form/param/diy-form-write-config-param.dto';
import { DiyFormSubmitConfigParamDto } from '../dtos/diy-form-submit-config-param.dto'; import { DiyFormSubmitConfigParam } from '../../../../dtos/core/diy_form/param/diy-form-submit-config-param.dto';
@Injectable() @Injectable()
export class DiyFormConfigServiceImplService { export class DiyFormConfigServiceImplService {

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

@@ -2,8 +2,11 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { DiyFormRecordsSearchParamDto } from '../dtos/diy-form-records-search-param.dto'; import { DiyFormRecordsSearchParam } from '../../../../dtos/core/diy_form/param/diy-form-records-search-param.dto';
import { DiyFormRecordsListVo } from '../../../../dtos/core/diy_form/vo/diy-form-records-list-vo.dto';
import { DiyFormRecordsFieldsSearchParam } from '../../../../dtos/admin/diy_form/param/diy-form-records-fields-search-param.dto';
import { DiyFormFieldsListVo } from '../../../../dtos/admin/diy_form/vo/diy-form-fields-list-vo.dto';
@Injectable() @Injectable()
export class DiyFormRecordsServiceImplService { export class DiyFormRecordsServiceImplService {
@@ -82,7 +85,7 @@ export class DiyFormRecordsServiceImplService {
.select("form_id, field_key, field_type, field_value, count(*) as write_count") .select("form_id, field_key, field_type, field_value, count(*) as write_count")
.groupBy("field_value")); .groupBy("field_value"));
for (const i of number = 0; i < valueList.length; i++) { for (const i of number = 0; i < valueList.length; i++) {
const value: Record<String, Object> = valueList.get(i); const value: Record<string, Object> = valueList.get(i);
const diyFormComponentEnum: DiyFormComponentEnum = new DiyFormComponentEnum(); const diyFormComponentEnum: DiyFormComponentEnum = new DiyFormComponentEnum();
const component: Record<string, any> = diyFormComponentEnum.getComponent(value.get("field_type").toString()); const component: Record<string, any> = diyFormComponentEnum.getComponent(value.get("field_type").toString());
if(component.containsKey("render")){ if(component.containsKey("render")){
@@ -112,7 +115,7 @@ export class DiyFormRecordsServiceImplService {
if (totalCount > 0) { if (totalCount > 0) {
const totalPercent: number = 100; const totalPercent: number = 100;
for (const i of number = 0; i < valueList.length; i++) { for (const i of number = 0; i < valueList.length; i++) {
const value: Record<String, Object> = valueList.get(i); const value: Record<string, Object> = valueList.get(i);
double itemPercent; double itemPercent;
if (i == valueList.length - 1) { if (i == valueList.length - 1) {
itemPercent = totalPercent; itemPercent = totalPercent;
@@ -138,7 +141,7 @@ export class DiyFormRecordsServiceImplService {
} }
List<Record<String, Object>> fieldList = diyFormRecordsFieldsMapper.selectMaps(fieldQueryWrapper); List<Record<String, Object>> fieldList = diyFormRecordsFieldsMapper.selectMaps(fieldQueryWrapper);
for (const i of number = 0; i < fieldList.length; i++) { for (const i of number = 0; i < fieldList.length; i++) {
const value: Record<String, Object> = fieldList.get(i); const value: Record<string, Object> = fieldList.get(i);
const diyFormComponentEnum: DiyFormComponentEnum = new DiyFormComponentEnum(); const diyFormComponentEnum: DiyFormComponentEnum = new DiyFormComponentEnum();
const component: Record<string, any> = diyFormComponentEnum.getComponent(value.get("field_type").toString()); const component: Record<string, any> = diyFormComponentEnum.getComponent(value.get("field_type").toString());
if(component.containsKey("render")){ if(component.containsKey("render")){
@@ -180,7 +183,7 @@ export class DiyFormRecordsServiceImplService {
valueMap.get(key).put("write_count", valueMap.get(key).get("write_count") + 1); valueMap.get(key).put("write_count", valueMap.get(key).get("write_count") + 1);
totalCount++; totalCount++;
} else { } else {
const newRecord: Record<String, Object> = new HashMap<>(record); const newRecord: Record<string, Object> = new HashMap<>(record);
newRecord.put("render_value", value); newRecord.put("render_value", value);
newRecord.put("write_count", 1); newRecord.put("write_count", 1);
valueMap.put(key, newRecord); valueMap.put(key, newRecord);
@@ -194,7 +197,7 @@ export class DiyFormRecordsServiceImplService {
List<Record<String, Object>> valueList = new ArrayList<>(valueMap.values()); List<Record<String, Object>> valueList = new ArrayList<>(valueMap.values());
const totalPercent: number = 100; const totalPercent: number = 100;
for (const i of number = 0; i < valueList.length; i++) { for (const i of number = 0; i < valueList.length; i++) {
const value: Record<String, Object> = valueList.get(i); const value: Record<string, Object> = valueList.get(i);
double itemPercent; double itemPercent;
if (i == valueList.length - 1) { if (i == valueList.length - 1) {
itemPercent = totalPercent; itemPercent = totalPercent;

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

@@ -2,17 +2,22 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, StringUtils, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, StringUtils, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { DiyFormSearchParamDto } from '../dtos/diy-form-search-param.dto'; import { DiyFormSearchParam } from '../../../../dtos/core/diy_form/param/diy-form-search-param.dto';
import { DiyFormParamDto } from '../dtos/diy-form-param.dto'; import { DiyFormListVo } from '../../../../dtos/admin/diy_form/vo/diy-form-list-vo.dto';
import { List<Integer>Dto } from '../dtos/list<-integer>.dto'; import { DiyFormInfoVo } from '../../../../dtos/api/diy/vo/diy-form-info-vo.dto';
import { DiyFormInitParamDto } from '../dtos/diy-form-init-param.dto'; import { DiyFormParam } from '../../../../dtos/api/diy/param/diy-form-param.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; import { DiyFormWriteConfigParam } from '../../../../dtos/core/diy_form/param/diy-form-write-config-param.dto';
import { DiyFormTemplateParamDto } from '../dtos/diy-form-template-param.dto'; import { DiyFormSubmitConfigParam } from '../../../../dtos/core/diy_form/param/diy-form-submit-config-param.dto';
import { DiyFormStatusParamDto } from '../dtos/diy-form-status-param.dto'; import { DiyFormInitParam } from '../../../../dtos/admin/diy_form/param/diy-form-init-param.dto';
import { DiyFormRecordsSearchParamDto } from '../dtos/diy-form-records-search-param.dto'; import { DiyFormInitVo } from '../../../../dtos/admin/diy_form/vo/diy-form-init-vo.dto';
import { DiyFormRecordsFieldsSearchParamDto } from '../dtos/diy-form-records-fields-search-param.dto'; import { JSONObject } from '../dtos/j-s-o-n-object.dto';
import { DiyFormSelectParamDto } from '../dtos/diy-form-select-param.dto'; import { DiyFormTemplateParam } from '../../../../dtos/admin/diy_form/param/diy-form-template-param.dto';
import { DiyFormStatusParam } from '../../../../dtos/admin/diy_form/param/diy-form-status-param.dto';
import { DiyFormRecordsSearchParam } from '../../../../dtos/core/diy_form/param/diy-form-records-search-param.dto';
import { DiyFormRecordsFieldsSearchParam } from '../../../../dtos/admin/diy_form/param/diy-form-records-fields-search-param.dto';
import { DiyFormFieldsListVo } from '../../../../dtos/admin/diy_form/vo/diy-form-fields-list-vo.dto';
import { DiyFormSelectParam } from '../../../../dtos/admin/diy_form/param/diy-form-select-param.dto';
@Injectable() @Injectable()
export class DiyFormServiceImplService { export class DiyFormServiceImplService {
@@ -232,7 +237,7 @@ export class DiyFormServiceImplService {
model.updateTime = Date.now( / 1000); model.updateTime = Date.now( / 1000);
diyFormMapper.updateById(model); diyFormMapper.updateById(model);
const formFieldsList: DiyFormFields[] = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); const formFieldsList: DiyFormFields[] = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }));
const formFieldsListMap: Record<String, DiyFormFields> = formFieldsList.collect(/* Collectors已删除 */.toMap(DiyFormFields::getFieldKey, a => a)); const formFieldsListMap: Record<string, DiyFormFields> = formFieldsList.collect(/* Collectors已删除 */.toMap(DiyFormFields::getFieldKey, a => a));
const existFieldKeys: string[] = []; const existFieldKeys: string[] = [];
const diyFormFields: DiyFormFields[] = []; const diyFormFields: DiyFormFields[] = [];
if (CommonUtils.isNotEmpty(editParam.value)) { if (CommonUtils.isNotEmpty(editParam.value)) {

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

@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result } from '@wwjBoot'; import { QueueService, EventBus, Result } from '@wwjBoot';
import { List<GenerateColumn>Dto } from '../dtos/list<-generate-column>.dto';
@Injectable() @Injectable()
export class GenerateColumnServiceImplService { export class GenerateColumnServiceImplService {

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

@@ -2,11 +2,17 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, AppConfigService, CommonUtils } from '@wwjBoot'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { GenerateSearchParamDto } from '../dtos/generate-search-param.dto'; import { GenerateSearchParam } from '../../../../dtos/admin/generator/param/generate-search-param.dto';
import { GenerateParamDto } from '../dtos/generate-param.dto'; import { GenerateListVo } from '../../../../dtos/admin/generator/vo/generate-list-vo.dto';
import { GenerateEditParamDto } from '../dtos/generate-edit-param.dto'; import { GenerateDetailVo } from '../../../../dtos/admin/generator/vo/generate-detail-vo.dto';
import { GenerateCodeParamDto } from '../dtos/generate-code-param.dto'; import { GenerateColumnVo } from '../dtos/generate-column-vo.dto';
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';
import { CoreGenerateTemplateVo } from '../../../../dtos/core/generator/vo/core-generate-template-vo.dto';
import { GeneratePreviewVo } from '../../../../dtos/admin/generator/vo/generate-preview-vo.dto';
import { MapperInfoVo } from '../../../../dtos/core/generator/vo/mapper-info-vo.dto';
@Injectable() @Injectable()
export class GenerateServiceImplService { export class GenerateServiceImplService {
@@ -153,7 +159,7 @@ export class GenerateServiceImplService {
} }
List<Record<String, Object>> listData = jdbcTemplate.queryForList(sql); List<Record<String, Object>> listData = jdbcTemplate.queryForList(sql);
if (CommonUtils.isEmpty(listData)) throw new AdminException("数据表不存在"); if (CommonUtils.isEmpty(listData)) throw new AdminException("数据表不存在");
const table: Record<String, Object> = listData.get(0); const table: Record<string, Object> = listData.get(0);
if (CommonUtils.isEmpty(table)) throw new AdminException("数据表不存在"); if (CommonUtils.isEmpty(table)) throw new AdminException("数据表不存在");
const tableName: string = table.get("Name").toString().substring(tablePrefix.length()); const tableName: string = table.get("Name").toString().substring(tablePrefix.length());
@@ -369,7 +375,7 @@ export class GenerateServiceImplService {
*/ */
async getDbFieldType(type: string): Promise<any> { async getDbFieldType(type: string): Promise<any> {
type = getDbType(type); type = getDbType(type);
const map: Record<String, String[]> = SqlColumnEnum.map; const map: Record<string, String[]> = SqlColumnEnum.map;
const field: string = ""; const field: string = "";
for (Map.Entry<String, String[]> entry : map.entrySet()) { for (Map.Entry<String, String[]> entry : map.entrySet()) {
if ([entry.getValue(]).includes(type)) { if ([entry.getValue(]).includes(type)) {

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

@@ -2,11 +2,16 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, AppConfigService, CommonUtils } from '@wwjBoot'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SiteSearchParamDto } from '../dtos/site-search-param.dto'; import { SiteSearchParam } from '../../../../dtos/admin/site/param/site-search-param.dto';
import { SiteParamDto } from '../dtos/site-param.dto'; import { SiteListVo } from '../../../../dtos/admin/site/vo/site-list-vo.dto';
import { HomeSiteAddParamDto } from '../dtos/home-site-add-param.dto'; import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto';
import { List<Addon>Dto } from '../dtos/list<-addon>.dto'; import { SiteParam } from '../../../../dtos/admin/site/param/site-param.dto';
import { UserCreateSiteVo } from '../../../../dtos/admin/home/vo/user-create-site-vo.dto';
import { SiteGroupVo } from '../../../../dtos/admin/home/vo/site-group-vo.dto';
import { HomeSiteAddParam } from '../../../../dtos/admin/home/param/home-site-add-param.dto';
import { SiteAddParam } from '../../../../dtos/admin/site/param/site-add-param.dto';
import { AddonInfoVo } from '../../../../dtos/admin/addon/vo/addon-info-vo.dto';
@Injectable() @Injectable()
export class AuthSiteServiceImplService { export class AuthSiteServiceImplService {

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

@@ -2,9 +2,16 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { MemberAccountLogSearchParamDto } from '../dtos/member-account-log-search-param.dto'; import { MemberAccountLogSearchParam } from '../../../../dtos/admin/member/param/member-account-log-search-param.dto';
import { AdjustAccountParamDto } from '../dtos/adjust-account-param.dto'; import { MemberAccountLogVo } from '../../../../dtos/admin/member/vo/member-account-log-vo.dto';
import { MemberAccountLogListVo } from '../../../../dtos/admin/member/vo/member-account-log-list-vo.dto';
import { MemberBriefInfoVo } from '../../../../dtos/admin/member/vo/member-brief-info-vo.dto';
import { MemberAccountVo } from '../../../../dtos/admin/member/vo/member-account-vo.dto';
import { SumCommissionVo } from '../../../../dtos/admin/member/vo/sum-commission-vo.dto';
import { SumBalanceVo } from '../../../../dtos/admin/member/vo/sum-balance-vo.dto';
import { SumPointVo } from '../../../../dtos/admin/member/vo/sum-point-vo.dto';
import { AdjustAccountParam } from '../../../../dtos/admin/member/param/adjust-account-param.dto';
@Injectable() @Injectable()
export class MemberAccountServiceImplService { export class MemberAccountServiceImplService {

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

@@ -2,8 +2,10 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import { MemberAddressSearchParamDto } from '../dtos/member-address-search-param.dto'; import { MemberAddressSearchParam } from '../../../../dtos/admin/member/param/member-address-search-param.dto';
import { MemberAddressParamDto } from '../dtos/member-address-param.dto'; import { MemberAddressListVo } from '../../../../dtos/admin/member/vo/member-address-list-vo.dto';
import { MemberAddressInfoVo } from '../../../../dtos/admin/member/vo/member-address-info-vo.dto';
import { MemberAddressParam } from '../../../../dtos/admin/member/param/member-address-param.dto';
@Injectable() @Injectable()
export class MemberAddressServiceImplService { export class MemberAddressServiceImplService {

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

@@ -2,11 +2,15 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { MemberCashOutSearchParamDto } from '../dtos/member-cash-out-search-param.dto'; import { MemberCashOutSearchParam } from '../../../../dtos/admin/member/param/member-cash-out-search-param.dto';
import { MemberCashOutAuditParamDto } from '../dtos/member-cash-out-audit-param.dto'; import { MemberCashOutListVo } from '../../../../dtos/api/member/vo/member-cash-out-list-vo.dto';
import { CashOutTransferParamDto } from '../dtos/cash-out-transfer-param.dto'; import { MemberBriefInfoVo } from '../../../../dtos/admin/member/vo/member-brief-info-vo.dto';
import { MemberCashOutRemarkParamDto } from '../dtos/member-cash-out-remark-param.dto'; import { MemberCashOutInfoVo } from '../../../../dtos/api/member/vo/member-cash-out-info-vo.dto';
import { CashOutStatVo } from '../../../../dtos/admin/member/vo/cash-out-stat-vo.dto';
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';
import { MemberCashOutRemarkParam } from '../../../../dtos/admin/member/param/member-cash-out-remark-param.dto';
@Injectable() @Injectable()
export class MemberCashOutServiceImplService { export class MemberCashOutServiceImplService {

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

@@ -2,10 +2,10 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { LoginConfigParamDto } from '../dtos/login-config-param.dto'; import { LoginConfigParam } from '../../../../dtos/admin/member/param/login-config-param.dto';
import { CashOutConfigParamDto } from '../dtos/cash-out-config-param.dto'; import { CashOutConfigParam } from '../../../../dtos/admin/member/param/cash-out-config-param.dto';
import { MemberConfigParamDto } from '../dtos/member-config-param.dto'; import { MemberConfigParam } from '../../../../dtos/admin/member/param/member-config-param.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; import { JSONObject } from '../dtos/j-s-o-n-object.dto';
@Injectable() @Injectable()
export class MemberConfigServiceImplService { export class MemberConfigServiceImplService {

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

@@ -2,9 +2,12 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { MemberLabelSearchParamDto } from '../dtos/member-label-search-param.dto'; import { MemberLabelSearchParam } from '../../../../dtos/admin/member/param/member-label-search-param.dto';
import { MemberLabelEditParamDto } from '../dtos/member-label-edit-param.dto'; import { MemberLabelListVo } from '../../../../dtos/admin/member/vo/member-label-list-vo.dto';
import { MemberLabelInfoVo } from '../../../../dtos/admin/member/vo/member-label-info-vo.dto';
import { MemberLabelEditParam } from '../../../../dtos/admin/member/param/member-label-edit-param.dto';
import { MemberLabelAllListVo } from '../../../../dtos/admin/member/vo/member-label-all-list-vo.dto';
@Injectable() @Injectable()
export class MemberLabelServiceImplService { export class MemberLabelServiceImplService {

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

@@ -2,9 +2,12 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { MemberLevelSearchParamDto } from '../dtos/member-level-search-param.dto'; import { MemberLevelSearchParam } from '../../../../dtos/admin/member/param/member-level-search-param.dto';
import { MemberLevelParamDto } from '../dtos/member-level-param.dto'; import { MemberLevelListVo } from '../../../../dtos/admin/member/vo/member-level-list-vo.dto';
import { MemberLevelInfoVo } from '../../../../dtos/api/member/vo/member-level-info-vo.dto';
import { MemberLevelParam } from '../../../../dtos/api/member/param/member-level-param.dto';
import { MemberLevelAllListVo } from '../../../../dtos/admin/member/vo/member-level-all-list-vo.dto';
@Injectable() @Injectable()
export class MemberLevelServiceImplService { export class MemberLevelServiceImplService {

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

@@ -2,13 +2,17 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, StringUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, StringUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { MemberSearchParamDto } from '../dtos/member-search-param.dto'; import { MemberSearchParam } from '../../../../dtos/admin/member/param/member-search-param.dto';
import { MemberAddParamDto } from '../dtos/member-add-param.dto'; import { MemberListVo } from '../../../../dtos/admin/member/vo/member-list-vo.dto';
import { MemberParamDto } from '../dtos/member-param.dto'; import { MemberLabelAllListVo } from '../../../../dtos/admin/member/vo/member-label-all-list-vo.dto';
import { MemberModifyParamDto } from '../dtos/member-modify-param.dto'; import { MemberInfoVo } from '../../../../dtos/api/member/vo/member-info-vo.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; import { MemberAddParam } from '../../../../dtos/admin/member/param/member-add-param.dto';
import { BatchModifyParamDto } from '../dtos/batch-modify-param.dto'; import { MemberParam } from '../../../../dtos/admin/member/param/member-param.dto';
import { MemberModifyParam } from '../../../../dtos/api/member/param/member-modify-param.dto';
import { MemberAllListVo } from '../../../../dtos/admin/member/vo/member-all-list-vo.dto';
import { JSONObject } from '../dtos/j-s-o-n-object.dto';
import { BatchModifyParam } from '../../../../dtos/admin/member/param/batch-modify-param.dto';
@Injectable() @Injectable()
export class MemberServiceImplService { export class MemberServiceImplService {

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

@@ -2,9 +2,12 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { MemberSignSearchParamDto } from '../dtos/member-sign-search-param.dto'; import { MemberSignSearchParam } from '../../../../dtos/admin/member/param/member-sign-search-param.dto';
import { SignConfigParamDto } from '../dtos/sign-config-param.dto'; import { MemberSignListVo } from '../../../../dtos/admin/member/vo/member-sign-list-vo.dto';
import { MemberBriefInfoVo } from '../../../../dtos/admin/member/vo/member-brief-info-vo.dto';
import { SignConfigVo } from '../../../../dtos/admin/member/vo/sign-config-vo.dto';
import { SignConfigParam } from '../../../../dtos/admin/member/param/sign-config-param.dto';
@Injectable() @Injectable()
export class MemberSignServiceImplService { export class MemberSignServiceImplService {

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

@@ -3,9 +3,10 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, AppConfigService } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService } from '@wwjBoot';
import * as fs from 'fs'; import * as fs from 'fs';
import { ConnectTestParamDto } from '../dtos/connect-test-param.dto'; import { CoreSysConfigVo } from '../dtos/core-sys-config-vo.dto';
import { BooleanDto } from '../dtos/boolean.dto'; import { ConnectTestParam } from '../../../../dtos/admin/niucloud/param/connect-test-param.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; import { JSONObject } from '../dtos/j-s-o-n-object.dto';
import { InstallAddonListVo } from '../dtos/install-addon-list-vo.dto';
@Injectable() @Injectable()
export class CloudBuildServiceImplService { export class CloudBuildServiceImplService {
@@ -58,7 +59,7 @@ export class CloudBuildServiceImplService {
const instance: NiucloudUtils = NiucloudUtils.instance; const instance: NiucloudUtils = NiucloudUtils.instance;
const actionQuery: Record<String, Object> = new const query: Record<>(); const actionQuery: Record<string, Object> = new const query: Record<>();
actionQuery.put("data[product_key]", instance.productKey); actionQuery.put("data[product_key]", instance.productKey);
const actionToken: Record<string, any> = this.niucloudService.getActionToken("cloudbuild", actionQuery); const actionToken: Record<string, any> = this.niucloudService.getActionToken("cloudbuild", actionQuery);
@@ -94,7 +95,7 @@ export class CloudBuildServiceImplService {
const instance: NiucloudUtils = NiucloudUtils.instance; const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<string, Object> = {};
query.put("authorize_code", instance.code); query.put("authorize_code", instance.code);
query.put("timestamp", this.buildTask.getStr("timestamp")); query.put("timestamp", this.buildTask.getStr("timestamp"));

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

@@ -2,10 +2,14 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result } from '@wwjBoot'; import { QueueService, EventBus, Result } from '@wwjBoot';
import { SetAuthorizeParamDto } from '../dtos/set-authorize-param.dto'; import { FrameworkVersionListVo } from '../../../../dtos/admin/niucloud/vo/framework-version-list-vo.dto';
import { Map<StringDto } from '../dtos/map<-string.dto'; import { AuthInfoVo } from '../../../../dtos/admin/niucloud/vo/auth-info-vo.dto';
import { Object>Dto } from '../dtos/object>.dto'; import { SetAuthorizeParam } from '../../../../dtos/core/niucloud/param/set-authorize-param.dto';
import { GetAppVersionListParamDto } from '../dtos/get-app-version-list-param.dto'; import { ModuleListVo } from '../../../../dtos/admin/niucloud/vo/module-list-vo.dto';
import { Map<String } from '../dtos/map<-string.dto';
import { Object> } from '../dtos/object>.dto';
import { GetAppVersionListParam } from '../../../../dtos/admin/niucloud/param/get-app-version-list-param.dto';
import { AppVersionListVo } from '../../../../dtos/admin/niucloud/vo/app-version-list-vo.dto';
@Injectable() @Injectable()
export class NiuCloudServiceImplService { export class NiuCloudServiceImplService {
@@ -19,7 +23,7 @@ export class NiuCloudServiceImplService {
async getFrameworkLastVersion(): Promise<any> { async getFrameworkLastVersion(): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.instance; const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<string, Object> = {};
query.put("product_key", instance.productKey); query.put("product_key", instance.productKey);
const data: Record<string, any> = NiucloudUtils.Niucloud.get("store/framework/lastversion", query).getRecord<string, any>("data"); const data: Record<string, any> = NiucloudUtils.Niucloud.get("store/framework/lastversion", query).getRecord<string, any>("data");
@@ -39,7 +43,7 @@ export class NiuCloudServiceImplService {
async getFrameworkVersionList(): Promise<any> { async getFrameworkVersionList(): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.instance; const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<string, Object> = {};
query.put("product_key", instance.productKey); query.put("product_key", instance.productKey);
const data: JSONArray = NiucloudUtils.Niucloud.get("store/framework/version", query).getJSONArray("data"); const data: JSONArray = NiucloudUtils.Niucloud.get("store/framework/version", query).getJSONArray("data");
@@ -58,7 +62,7 @@ export class NiuCloudServiceImplService {
async getAuthinfo(): Promise<any> { async getAuthinfo(): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.instance; const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<string, Object> = {};
query.put("code", instance.code); query.put("code", instance.code);
query.put("secret", instance.secret); query.put("secret", instance.secret);
query.put("product_key", instance.productKey); query.put("product_key", instance.productKey);
@@ -78,7 +82,7 @@ export class NiuCloudServiceImplService {
async setAuthorize(param: SetAuthorizeParam): Promise<any> { async setAuthorize(param: SetAuthorizeParam): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.instance; const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<string, Object> = {};
query.put("code", param.authCode); query.put("code", param.authCode);
query.put("secret", param.authSecret); query.put("secret", param.authSecret);
query.put("product_key", instance.productKey); query.put("product_key", instance.productKey);
@@ -96,7 +100,7 @@ export class NiuCloudServiceImplService {
async getModuleList(): Promise<any> { async getModuleList(): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.instance; const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<string, Object> = {};
query.put("code", instance.code); query.put("code", instance.code);
query.put("secret", instance.secret); query.put("secret", instance.secret);
query.put("product_key", instance.productKey); query.put("product_key", instance.productKey);
@@ -126,7 +130,7 @@ export class NiuCloudServiceImplService {
async checkKey(key: string): Promise<any> { async checkKey(key: string): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.instance; const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<string, Object> = {};
query.put("product_key", instance.productKey); query.put("product_key", instance.productKey);
return NiucloudUtils.Niucloud.get("store/app_check/" + key, query).get("data", boolean.class); return NiucloudUtils.Niucloud.get("store/app_check/" + key, query).get("data", boolean.class);
@@ -138,7 +142,7 @@ export class NiuCloudServiceImplService {
async getAppVersionList(param: GetAppVersionListParam): Promise<any> { async getAppVersionList(param: GetAppVersionListParam): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.instance; const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<string, Object> = {};
query.put("product_key", instance.productKey); query.put("product_key", instance.productKey);
query.put("app_key", param.appKey); query.put("app_key", param.appKey);

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

@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { NoticeLogSearchParamDto } from '../dtos/notice-log-search-param.dto'; import { NoticeLogSearchParam } from '../../../../dtos/core/notice/param/notice-log-search-param.dto';
@Injectable() @Injectable()
export class NoticeLogServiceImplService { export class NoticeLogServiceImplService {

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

@@ -2,8 +2,8 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; import { JSONObject } from '../dtos/j-s-o-n-object.dto';
import { EditMessageStatusParamDto } from '../dtos/edit-message-status-param.dto'; import { EditMessageStatusParam } from '../../../../dtos/admin/notice/param/edit-message-status-param.dto';
@Injectable() @Injectable()
export class NoticeServiceImplService { export class NoticeServiceImplService {

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

@@ -3,19 +3,20 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, StringUtils, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, StringUtils, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot';
import * as path from 'path'; import * as path from 'path';
import { SendMobileCodeParamDto } from '../dtos/send-mobile-code-param.dto'; import { SendMobileCodeParam } from '../../../../dtos/api/login/param/send-mobile-code-param.dto';
import { RegisterAccountParamDto } from '../dtos/register-account-param.dto'; import { RegisterAccountParam } from '../../../../dtos/admin/notice/param/register-account-param.dto';
import { PageParamDto } from '../dtos/page-param.dto'; import { TemplateListVo } from '../../../../dtos/admin/notice/vo/template-list-vo.dto';
import { OrderListParamDto } from '../dtos/order-list-param.dto'; import { NoticeEnumListVo } from '../../../../dtos/notice/vo/notice-enum-list-vo.dto';
import { SendListParamDto } from '../dtos/send-list-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { EditAccountParamDto } from '../dtos/edit-account-param.dto'; import { OrderListParam } from '../../../../dtos/admin/notice/param/order-list-param.dto';
import { SignDeleteParamDto } from '../dtos/sign-delete-param.dto'; import { SendListParam } from '../../../../dtos/admin/notice/param/send-list-param.dto';
import { SmsPackageParamDto } from '../dtos/sms-package-param.dto'; import { EditAccountParam } from '../../../../dtos/admin/notice/param/edit-account-param.dto';
import { OrderCalculateParamDto } from '../dtos/order-calculate-param.dto'; import { SignDeleteParam } from '../../../../dtos/admin/notice/param/sign-delete-param.dto';
import { TemplateCreateParamDto } from '../dtos/template-create-param.dto'; import { SmsPackageParam } from '../../../../dtos/admin/notice/param/sms-package-param.dto';
import { Map<StringDto } from '../dtos/map<-string.dto'; import { OrderCalculateParam } from '../../../../dtos/admin/notice/param/order-calculate-param.dto';
import { Object>Dto } from '../dtos/object>.dto'; import { TemplateCreateParam } from '../../../../dtos/admin/notice/param/template-create-param.dto';
import { List<TemplateListVo>Dto } from '../dtos/list<-template-list-vo>.dto'; import { Map<String } from '../dtos/map<-string.dto';
import { Object> } from '../dtos/object>.dto';
@Injectable() @Injectable()
export class NuiSmsServiceImplService { export class NuiSmsServiceImplService {
@@ -44,7 +45,7 @@ export class NuiSmsServiceImplService {
* sendMobileCode * sendMobileCode
*/ */
async sendMobileCode(param: SendMobileCodeParam): Promise<any> { async sendMobileCode(param: SendMobileCodeParam): Promise<any> {
const body: Record<String, String> = {}; const body: Record<string, String> = {};
body.put("mobile", param.mobile); body.put("mobile", param.mobile);
body.put("captcha_key", param.captchaKey); body.put("captcha_key", param.captchaKey);
body.put("captcha_code", param.captchaCode); body.put("captcha_code", param.captchaCode);
@@ -84,7 +85,7 @@ export class NuiSmsServiceImplService {
*/ */
async loginAccount(param: RegisterAccountParam): Promise<number> { async loginAccount(param: RegisterAccountParam): Promise<number> {
const url: string = String.format(LOGIN_ACCOUNT_URL, param.username); const url: string = String.format(LOGIN_ACCOUNT_URL, param.username);
const body: Record<String, String> = {}; const body: Record<string, String> = {};
body.put("username", param.username); body.put("username", param.username);
body.put("password", param.password); body.put("password", param.password);
try { try {
@@ -124,7 +125,7 @@ export class NuiSmsServiceImplService {
const newPassword: string = null; const newPassword: string = null;
try { try {
const resetPasswordUrl: string = String.format(RESET_PASSWORD_URL, param.username); const resetPasswordUrl: string = String.format(RESET_PASSWORD_URL, param.username);
const resetPasswordBody: Record<String, String> = {}; const resetPasswordBody: Record<string, String> = {};
resetPasswordBody.put("mobile", param.mobile); resetPasswordBody.put("mobile", param.mobile);
resetPasswordBody.put("code", param.code); resetPasswordBody.put("code", param.code);
resetPasswordBody.put("key", param.key); resetPasswordBody.put("key", param.key);
@@ -179,7 +180,7 @@ export class NuiSmsServiceImplService {
throw new ApiException("牛云短信账号异常,请重新登录账号"); throw new ApiException("牛云短信账号异常,请重新登录账号");
} }
const list: SysNotice[] = this.sysNoticeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); const list: SysNotice[] = this.sysNoticeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }));
const map: Record<String, SysNotice> = {}; const map: Record<string, SysNotice> = {};
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
map = list.collect(/* Collectors已删除 */.toMap(SysNotice::getKey, item => item)); map = list.collect(/* Collectors已删除 */.toMap(SysNotice::getKey, item => item));
} }
@@ -210,7 +211,7 @@ export class NuiSmsServiceImplService {
const niuSmsTemplates: NiuSmsTemplate[] = this.niuSmsTemplateRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) const niuSmsTemplates: NiuSmsTemplate[] = this.niuSmsTemplateRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })
.eq("username", username) .eq("username", username)
.eq("site_id", siteId)); .eq("site_id", siteId));
const templateMap: Record<String, NiuSmsTemplate> = {}; const templateMap: Record<string, NiuSmsTemplate> = {};
if (!CollectionUtils.isEmpty(niuSmsTemplates)){ if (!CollectionUtils.isEmpty(niuSmsTemplates)){
templateMap = niuSmsTemplates.collect(/* Collectors已删除 */.toMap(NiuSmsTemplate::getTemplateKey, item => item)); templateMap = niuSmsTemplates.collect(/* Collectors已删除 */.toMap(NiuSmsTemplate::getTemplateKey, item => item));
} }
@@ -286,7 +287,7 @@ export class NuiSmsServiceImplService {
const orderListUrl: string = String.format(ORDER_LIST_URL, username); const orderListUrl: string = String.format(ORDER_LIST_URL, username);
const result: Record<string, any> = null; const result: Record<string, any> = null;
try { try {
const orderListParam: Record<String, Object> = {}; const orderListParam: Record<string, Object> = {};
orderListParam.put("out_trade_no", param.outTradeNo); orderListParam.put("out_trade_no", param.outTradeNo);
orderListParam.put("order_status", param.status); orderListParam.put("order_status", param.status);
orderListParam.put("create_time_start", param.createTimeStart); orderListParam.put("create_time_start", param.createTimeStart);
@@ -309,7 +310,7 @@ export class NuiSmsServiceImplService {
*/ */
async accountSendList(pageParam: PageParam, username: string, param: SendListParam): Promise<number> { async accountSendList(pageParam: PageParam, username: string, param: SendListParam): Promise<number> {
const accountSendUrl: string = String.format(ACCOUNT_SEND_LIST_URL, username); const accountSendUrl: string = String.format(ACCOUNT_SEND_LIST_URL, username);
const accountSendParam: Record<String, Object> = {}; const accountSendParam: Record<string, Object> = {};
accountSendParam.put("mobile", param.mobile); accountSendParam.put("mobile", param.mobile);
accountSendParam.put("content", param.content); accountSendParam.put("content", param.content);
accountSendParam.put("smsStatus", param.smsStatus); accountSendParam.put("smsStatus", param.smsStatus);
@@ -357,7 +358,7 @@ export class NuiSmsServiceImplService {
*/ */
async editAccount(username: string, param: EditAccountParam): Promise<number> { async editAccount(username: string, param: EditAccountParam): Promise<number> {
const editAccountUrl: string = String.format(ACCOUNT_EDIT_URL, username); const editAccountUrl: string = String.format(ACCOUNT_EDIT_URL, username);
const editAccountBody: Record<String, Object> = {}; const editAccountBody: Record<string, Object> = {};
editAccountBody.put("new_mobile", param.newMobile); editAccountBody.put("new_mobile", param.newMobile);
editAccountBody.put("mobile", param.mobile); editAccountBody.put("mobile", param.mobile);
editAccountBody.put("code", param.code); editAccountBody.put("code", param.code);
@@ -428,7 +429,7 @@ export class NuiSmsServiceImplService {
* getSmsPackageList * getSmsPackageList
*/ */
async getSmsPackageList(param: SmsPackageParam): Promise<any> { async getSmsPackageList(param: SmsPackageParam): Promise<any> {
const pageListParam: Record<String, Object> = {}; const pageListParam: Record<string, Object> = {};
pageListParam.put("package_name", param.packageName); pageListParam.put("package_name", param.packageName);
pageListParam.put("sms_num", param.smsNum); pageListParam.put("sms_num", param.smsNum);
pageListParam.put("price_start", param.priceStart); pageListParam.put("price_start", param.priceStart);
@@ -456,7 +457,7 @@ export class NuiSmsServiceImplService {
*/ */
async orderCalculate(username: string, param: OrderCalculateParam): Promise<any> { async orderCalculate(username: string, param: OrderCalculateParam): Promise<any> {
const orderCalculateUrl: string = String.format(ORDER_CALCULATE_URL, username); const orderCalculateUrl: string = String.format(ORDER_CALCULATE_URL, username);
const orderCalculateBody: Record<String, Object> = {}; const orderCalculateBody: Record<string, Object> = {};
orderCalculateBody.put("package_id", param.packageId); orderCalculateBody.put("package_id", param.packageId);
try { try {
const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.post(orderCalculateUrl, orderCalculateBody); const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.post(orderCalculateUrl, orderCalculateBody);
@@ -475,7 +476,7 @@ export class NuiSmsServiceImplService {
*/ */
async createOrder(username: string, param: OrderCalculateParam): Promise<any> { async createOrder(username: string, param: OrderCalculateParam): Promise<any> {
const orderCreateUrl: string = String.format(ORDER_CREATE_URL, username); const orderCreateUrl: string = String.format(ORDER_CREATE_URL, username);
const orderCreateBody: Record<String, Object> = {}; const orderCreateBody: Record<string, Object> = {};
orderCreateBody.put("package_id", param.packageId); orderCreateBody.put("package_id", param.packageId);
try { try {
const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.post(orderCreateUrl, orderCreateBody); const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.post(orderCreateUrl, orderCreateBody);
@@ -503,7 +504,7 @@ export class NuiSmsServiceImplService {
} }
const returnUrl: string = String.format("%s://%s/site/setting/sms/pay", protocol, host); const returnUrl: string = String.format("%s://%s/site/setting/sms/pay", protocol, host);
const payInfoUrl: string = String.format(ORDER_PAY_URL, username); const payInfoUrl: string = String.format(ORDER_PAY_URL, username);
const payInfoBody: Record<String, Object> = {}; const payInfoBody: Record<string, Object> = {};
payInfoBody.put("notify_url", payInfoUrl); payInfoBody.put("notify_url", payInfoUrl);
payInfoBody.put("return_url", returnUrl); payInfoBody.put("return_url", returnUrl);
payInfoBody.put("out_trade_no", outTradeNo); payInfoBody.put("out_trade_no", outTradeNo);
@@ -581,7 +582,7 @@ export class NuiSmsServiceImplService {
const config: Record<string, any> = getConfig(false); const config: Record<string, any> = getConfig(false);
const templateCreateUrl: string = String.format(TEMPLATE_ADD_URL, username); const templateCreateUrl: string = String.format(TEMPLATE_ADD_URL, username);
const templateCreateBody: Record<String, Object> = {}; const templateCreateBody: Record<string, Object> = {};
templateCreateBody.put("temName", path.basename(templateInfo)); templateCreateBody.put("temName", path.basename(templateInfo));
templateCreateBody.put("temType", param.templateType); templateCreateBody.put("temType", param.templateType);
templateCreateBody.put("temContent", templateInfo.sms.get("content")); templateCreateBody.put("temContent", templateInfo.sms.get("content"));
@@ -632,7 +633,7 @@ export class NuiSmsServiceImplService {
*/ */
async templateDelete(username: string, templateId: string): Promise<any> { async templateDelete(username: string, templateId: string): Promise<any> {
const config: Record<string, any> = getConfig(false); const config: Record<string, any> = getConfig(false);
const deleteBody: Record<String, Object> = {}; const deleteBody: Record<string, Object> = {};
const time: number = DateUtil.currentSeconds(); const time: number = DateUtil.currentSeconds();
deleteBody.put("tKey", time); deleteBody.put("tKey", time);
deleteBody.put("password", DigestUtil.md5Hex(DigestUtil.md5Hex(config.getStr("password")) + time)); deleteBody.put("password", DigestUtil.md5Hex(DigestUtil.md5Hex(config.getStr("password")) + time));
@@ -660,7 +661,7 @@ export class NuiSmsServiceImplService {
throw new AdminException("短信模版暂未报备"); throw new AdminException("短信模版暂未报备");
} }
const orderCreateUrl: string = String.format(TEMPLATE_INFO_URL, username); const orderCreateUrl: string = String.format(TEMPLATE_INFO_URL, username);
const templateInfoParam: Record<String, Object> = {}; const templateInfoParam: Record<string, Object> = {};
templateInfoParam.put("tem_id", niuSmsTemplate.templateId); templateInfoParam.put("tem_id", niuSmsTemplate.templateId);
try { try {
const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.get(orderCreateUrl, templateInfoParam); const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.get(orderCreateUrl, templateInfoParam);
@@ -701,7 +702,7 @@ export class NuiSmsServiceImplService {
const config: Record<string, any> = getConfig(true); const config: Record<string, any> = getConfig(true);
config.put("default", CommonUtils.isNotEmpty(param.defaultVal) ? param.defaultVal : config.getOrDefault("default", "")); config.put("default", CommonUtils.isNotEmpty(param.defaultVal) ? param.defaultVal : config.getOrDefault("default", ""));
const niuSmsConfig: Record<string, any> = config.getRecord<string, any>(NIUYUN); const niuSmsConfig: Record<string, any> = config.getRecord<string, any>(NIUYUN);
const newNiuSmsConfig: Record<String, Object> = {}; const newNiuSmsConfig: Record<string, Object> = {};
newNiuSmsConfig.put("username", CommonUtils.isNotEmpty(param.username) ? param.username : niuSmsConfig != null ? niuSmsConfig.getOrDefault("username", "") : ""); newNiuSmsConfig.put("username", CommonUtils.isNotEmpty(param.username) ? param.username : niuSmsConfig != null ? niuSmsConfig.getOrDefault("username", "") : "");
newNiuSmsConfig.put("password", CommonUtils.isNotEmpty(param.password) ? param.password : niuSmsConfig != null ? niuSmsConfig.getOrDefault("password", "") : ""); newNiuSmsConfig.put("password", CommonUtils.isNotEmpty(param.password) ? param.password : niuSmsConfig != null ? niuSmsConfig.getOrDefault("password", "") : "");
newNiuSmsConfig.put("signature", CommonUtils.isNotEmpty(param.signature) ? param.signature : niuSmsConfig != null ? niuSmsConfig.getOrDefault("signature", "") : ""); newNiuSmsConfig.put("signature", CommonUtils.isNotEmpty(param.signature) ? param.signature : niuSmsConfig != null ? niuSmsConfig.getOrDefault("signature", "") : "");

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

@@ -2,8 +2,10 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, StringUtils, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, StringUtils, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot';
import { PayChannelAllSetParamDto } from '../dtos/pay-channel-all-set-param.dto'; import { PayChanneltemVo } from '../../../../dtos/admin/pay/vo/pay-channeltem-vo.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; import { PayChannelAllSetParam } from '../../../../dtos/admin/pay/param/pay-channel-all-set-param.dto';
import { JSONObject } from '../dtos/j-s-o-n-object.dto';
import { PayChannelListVo } from '../../../../dtos/core/pay/vo/pay-channel-list-vo.dto';
@Injectable() @Injectable()
export class PayChannelServiceImplService { export class PayChannelServiceImplService {

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

@@ -2,9 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { PayRefundSearchParamDto } from '../dtos/pay-refund-search-param.dto'; import { PayRefundSearchParam } from '../../../../dtos/core/pay/param/pay-refund-search-param.dto';
import { PayRefundTransferParamDto } from '../dtos/pay-refund-transfer-param.dto'; import { PayRefundListVo } from '../../../../dtos/core/pay/vo/pay-refund-list-vo.dto';
import { PayRefundInfoVo } from '../../../../dtos/core/pay/vo/pay-refund-info-vo.dto';
import { PayRefundTransferParam } from '../../../../dtos/core/pay/param/pay-refund-transfer-param.dto';
@Injectable() @Injectable()
export class PayRefundServiceImplService { export class PayRefundServiceImplService {

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

@@ -2,10 +2,15 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { PaySearchParamDto } from '../dtos/pay-search-param.dto'; import { PaySearchParam } from '../../../../dtos/core/pay/param/pay-search-param.dto';
import { PayParamDto } from '../dtos/pay-param.dto'; import { PayListVo } from '../../../../dtos/core/pay/vo/pay-list-vo.dto';
import { GetFriendspayInfoByTradeParamDto } from '../dtos/get-friendspay-info-by-trade-param.dto'; import { PayInfoVo } from '../../../../dtos/core/pay/vo/pay-info-vo.dto';
import { PayParam } from '../../../../dtos/admin/pay/param/pay-param.dto';
import { GetFriendspayInfoByTradeParam } from '../../../../dtos/admin/pay/param/get-friendspay-info-by-trade-param.dto';
import { GetInfoByTradeVo } from '../../../../dtos/core/pay/vo/get-info-by-trade-vo.dto';
import { FriendsPayInfoByTradeVo } from '../../../../dtos/admin/pay/vo/friends-pay-info-by-trade-vo.dto';
import { PayTypeVo } from '../../../../dtos/core/pay/vo/pay-type-vo.dto';
@Injectable() @Injectable()
export class PayServiceImplService { export class PayServiceImplService {

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

@@ -2,8 +2,8 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { SetSceneIdParamDto } from '../dtos/set-scene-id-param.dto'; import { SetSceneIdParam } from '../../../../dtos/admin/pay/param/set-scene-id-param.dto';
import { SetTradeSceneParamDto } from '../dtos/set-trade-scene-param.dto'; import { SetTradeSceneParam } from '../../../../dtos/core/pay/param/set-trade-scene-param.dto';
@Injectable() @Injectable()
export class PayTransferServiceImplService { export class PayTransferServiceImplService {
@@ -18,7 +18,7 @@ export class PayTransferServiceImplService {
async setSceneId(param: SetSceneIdParam): Promise<any> { async setSceneId(param: SetSceneIdParam): Promise<any> {
const config: Record<string, any> = this.coreTransferSceneService.getWechatTransferSceneConfig(this.requestContext.siteId); const config: Record<string, any> = this.coreTransferSceneService.getWechatTransferSceneConfig(this.requestContext.siteId);
const tradeScenelist: Record<String, TransferSceneEnum> = TransferSceneEnum.wechatTransferSceneMap; const tradeScenelist: Record<string, TransferSceneEnum> = TransferSceneEnum.wechatTransferSceneMap;
if (!tradeScenelist.containsKey(param.scene)) { if (!tradeScenelist.containsKey(param.scene)) {
throw new BadRequestException("不存在的商户转账场景"); throw new BadRequestException("不存在的商户转账场景");
} }

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

@@ -2,8 +2,10 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SiteAccountLogSearchParamDto } from '../dtos/site-account-log-search-param.dto'; import { SiteAccountLogSearchParam } from '../../../../dtos/admin/site/param/site-account-log-search-param.dto';
import { SiteAccountLogListVo } from '../../../../dtos/admin/site/vo/site-account-log-list-vo.dto';
import { SiteAccountLogInfoVo } from '../../../../dtos/admin/site/vo/site-account-log-info-vo.dto';
@Injectable() @Injectable()
export class SiteAccountLogServiceImplService { export class SiteAccountLogServiceImplService {

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

@@ -2,12 +2,14 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, AppConfigService, CommonUtils } from '@wwjBoot'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils } from '@wwjBoot';
import { @LazyDto } from '../dtos/@-lazy.dto'; import { @Lazy } from '../dtos/@-lazy.dto';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SiteGroupSearchParamDto } from '../dtos/site-group-search-param.dto'; import { SiteGroupSearchParam } from '../../../../dtos/admin/site/param/site-group-search-param.dto';
import { SiteGroupAddParamDto } from '../dtos/site-group-add-param.dto'; import { SiteGroupListVo } from '../../../../dtos/admin/site/vo/site-group-list-vo.dto';
import { SiteGroupParamDto } from '../dtos/site-group-param.dto'; import { SiteGroupAddParam } from '../../../../dtos/admin/site/param/site-group-add-param.dto';
import { JSONArrayDto } from '../dtos/j-s-o-n-array.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';
@Injectable() @Injectable()
export class SiteGroupServiceImplService { export class SiteGroupServiceImplService {
@@ -186,7 +188,7 @@ export class SiteGroupServiceImplService {
* checkAddon * checkAddon
*/ */
async checkAddon(jsonArray: JSONArray): Promise<any> { async checkAddon(jsonArray: JSONArray): Promise<any> {
const addonListVoMap: Record<String, InstallAddonListVo> = this.coreAddonService.installAddonList; const addonListVoMap: Record<string, InstallAddonListVo> = this.coreAddonService.installAddonList;
const keys: string[] = new ArrayList<>(addonListVoMap.keySet()); const keys: string[] = new ArrayList<>(addonListVoMap.keySet());
const addonString: string[] = JSONUtil.toList(jsonArray, String.class); const addonString: string[] = JSONUtil.toList(jsonArray, String.class);
keys.retainAll(addonString); keys.retainAll(addonString);

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

@@ -3,13 +3,21 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import * as path from 'path'; import * as path from 'path';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SiteSearchParamDto } from '../dtos/site-search-param.dto'; import { SiteSearchParam } from '../../../../dtos/admin/site/param/site-search-param.dto';
import { SiteAddParamDto } from '../dtos/site-add-param.dto'; import { SiteListVo } from '../../../../dtos/admin/site/vo/site-list-vo.dto';
import { SiteEditParamDto } from '../dtos/site-edit-param.dto'; import { SiteAdminVo } from '../../../../dtos/admin/site/vo/site-admin-vo.dto';
import { Class<?>Dto } from '../dtos/class<?>.dto'; import { SiteAddParam } from '../../../../dtos/admin/site/param/site-add-param.dto';
import { SiteDto } from '../dtos/site.dto'; import { SiteUserParam } from '../../../../dtos/admin/site/param/site-user-param.dto';
import { SiteGroupDto } from '../dtos/site-group.dto'; import { SysUserRoleParam } from '../../../../dtos/admin/sys/param/sys-user-role-param.dto';
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 { 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';
@Injectable() @Injectable()
export class SiteServiceImplService { export class SiteServiceImplService {
@@ -124,7 +132,7 @@ export class SiteServiceImplService {
const model: Site = new Site(); const model: Site = new Site();
model.siteName = addParam.siteName; model.siteName = addParam.siteName;
model.groupId = addParam.groupId; model.groupId = addParam.groupId;
model.appType = AppTypeEnum.path.basename(SITE); model.appType = AppTypeEnum.basename(SITE);
model.createTime = DateUtils.currTime(); model.createTime = DateUtils.currTime();
model.expireTime = DateUtils.StringToTimestamp(addParam.expireTime); model.expireTime = DateUtils.StringToTimestamp(addParam.expireTime);
model.app = siteGroup.app; model.app = siteGroup.app;
@@ -159,7 +167,7 @@ export class SiteServiceImplService {
event.siteGroup = siteGroup; event.siteGroup = siteGroup;
EventAndSubscribeOfPublisher.publishAll(event); EventAndSubscribeOfPublisher.publishAll(event);
const param: Record<String, Object> = {}; const param: Record<string, Object> = {};
param.put("site_id", siteId); param.put("site_id", siteId);
param.put("main_app", siteGroup.app); param.put("main_app", siteGroup.app);
param.put("tag", "add"); param.put("tag", "add");
@@ -393,7 +401,7 @@ export class SiteServiceImplService {
const authMenuList: JSONArray = this.authService.getAuthMenuTreeList(1, "all"); const authMenuList: JSONArray = this.authService.getAuthMenuTreeList(1, "all");
// 将菜单列表转换为Map，便于通过menu_key查找 // 将菜单列表转换为Map，便于通过menu_key查找
const authMenuMap: Record<String, Record<string, any>> = {}; const authMenuMap: Record<string, Record<string, any>> = {};
for (const i of number = 0; i < authMenuList.length; i++) { for (const i of number = 0; i < authMenuList.length; i++) {
const menu: Record<string, any> = authMenuList.getRecord<string, any>(i); const menu: Record<string, any> = authMenuList.getRecord<string, any>(i);
authMenuMap.put(menu.get("menu_key").toString(), menu); authMenuMap.put(menu.get("menu_key").toString(), menu);
@@ -405,7 +413,7 @@ export class SiteServiceImplService {
return new SpecialMenuListVo("addon", []); return new SpecialMenuListVo("addon", []);
} }
const showList: Record<String, Object> = showCustomer(false); const showList: Record<string, Object> = showCustomer(false);
const addonChildMenus: AddonChildMenuEnum.MenuConfig[] = AddonChildMenuEnum.all; const addonChildMenus: AddonChildMenuEnum.MenuConfig[] = AddonChildMenuEnum.all;
const menuList: SpecialMenuListVo.MenuVo[] = []; const menuList: SpecialMenuListVo.MenuVo[] = [];
@@ -415,7 +423,7 @@ export class SiteServiceImplService {
const menuKey: string = item.key; const menuKey: string = item.key;
const menuKeyList: string[] = []; const menuKeyList: string[] = [];
if (showList.containsKey(menuKey) && showList.get(menuKey) instanceof Map) { if (showList.containsKey(menuKey) && showList.get(menuKey) instanceof Map) {
const menuItem: Record<String, Object> = (Record<String, Object>) showList.get(menuKey); const menuItem: Record<string, Object> = (Record<String, Object>) showList.get(menuKey);
if (menuItem.containsKey("list") && menuItem.get("list") instanceof List) { if (menuItem.containsKey("list") && menuItem.get("list") instanceof List) {
List<Record<String, Object>> listItems = (List<Record<String, Object>>) menuItem.get("list"); List<Record<String, Object>> listItems = (List<Record<String, Object>>) menuItem.get("list");
for (Record<String, Object> listItem : listItems) { for (Record<String, Object> listItem : listItems) {

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

@@ -2,9 +2,12 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SiteUserSearchParamDto } from '../dtos/site-user-search-param.dto'; import { SiteUserSearchParam } from '../../../../dtos/admin/site/param/site-user-search-param.dto';
import { SiteUserParamDto } from '../dtos/site-user-param.dto'; import { SiteUserVo } from '../../../../dtos/admin/site/vo/site-user-vo.dto';
import { SiteUserParam } from '../../../../dtos/admin/site/param/site-user-param.dto';
import { SysUserParam } from '../../../../dtos/admin/sys/param/sys-user-param.dto';
import { SysUserRoleParam } from '../../../../dtos/admin/sys/param/sys-user-role-param.dto';
@Injectable() @Injectable()
export class SiteUserServiceImplService { export class SiteUserServiceImplService {

8
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-hour-service-impl.service.ts
View File

@@ -2,9 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result } from '@wwjBoot'; import { QueueService, EventBus, Result } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { StatHourSearchParamDto } from '../dtos/stat-hour-search-param.dto'; import { StatHourSearchParam } from '../../../../dtos/admin/stat/param/stat-hour-search-param.dto';
import { StatHourParamDto } from '../dtos/stat-hour-param.dto'; import { StatHourListVo } from '../../../../dtos/admin/stat/vo/stat-hour-list-vo.dto';
import { StatHourInfoVo } from '../../../../dtos/admin/stat/vo/stat-hour-info-vo.dto';
import { StatHourParam } from '../../../../dtos/admin/stat/param/stat-hour-param.dto';
@Injectable() @Injectable()
export class StatHourServiceImplService { export class StatHourServiceImplService {

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

@@ -2,7 +2,15 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result } from '@wwjBoot'; import { QueueService, EventBus, Result } from '@wwjBoot';
import * as path from 'path'; import { StatInfoVo } from '../../../../dtos/admin/stat/vo/stat-info-vo.dto';
import { StatToDayVo } from '../../../../dtos/admin/stat/vo/stat-to-day-vo.dto';
import { MemberStatSearchParam } from '../../../../dtos/core/member/param/member-stat-search-param.dto';
import { SiteSearchParam } from '../../../../dtos/admin/site/param/site-search-param.dto';
import { StatSystemVo } from '../../../../dtos/admin/stat/vo/stat-system-vo.dto';
import { StatDateVo } from '../../../../dtos/admin/stat/vo/stat-date-vo.dto';
import { StatTypeVo } from '../../../../dtos/admin/stat/vo/stat-type-vo.dto';
import { StatAppVo } from '../../../../dtos/admin/stat/vo/stat-app-vo.dto';
import { CoreAddonSearchParam } from '../../../../dtos/core/addon/param/core-addon-search-param.dto';
@Injectable() @Injectable()
export class StatServiceImplService { export class StatServiceImplService {
@@ -35,17 +43,17 @@ export class StatServiceImplService {
//今日站点数 //今日站点数
const todaySiteParam: SiteSearchParam = new SiteSearchParam(); const todaySiteParam: SiteSearchParam = new SiteSearchParam();
todaySiteParam.createTime = createTimes; todaySiteParam.createTime = createTimes;
todaySiteParam.appType = AppTypeEnum.path.basename(SITE); todaySiteParam.appType = AppTypeEnum.basename(SITE);
statToDayVo.todaySiteCount = this.siteService.getSiteCountByCondition(todaySiteParam); statToDayVo.todaySiteCount = this.siteService.getSiteCountByCondition(todaySiteParam);
//正常站点数 //正常站点数
const normaSiteParam: SiteSearchParam = new SiteSearchParam(); const normaSiteParam: SiteSearchParam = new SiteSearchParam();
normaSiteParam.status = 1; normaSiteParam.status = 1;
normaSiteParam.appType = AppTypeEnum.path.basename(SITE); normaSiteParam.appType = AppTypeEnum.basename(SITE);
statToDayVo.normaSiteCount = this.siteService.getSiteCountByCondition(normaSiteParam); statToDayVo.normaSiteCount = this.siteService.getSiteCountByCondition(normaSiteParam);
//到期站点数 //到期站点数
const expireSiteParam: SiteSearchParam = new SiteSearchParam(); const expireSiteParam: SiteSearchParam = new SiteSearchParam();
expireSiteParam.status = 2; expireSiteParam.status = 2;
expireSiteParam.appType = AppTypeEnum.path.basename(SITE); expireSiteParam.appType = AppTypeEnum.basename(SITE);
statToDayVo.expireSiteCount = this.siteService.getSiteCountByCondition(expireSiteParam); statToDayVo.expireSiteCount = this.siteService.getSiteCountByCondition(expireSiteParam);
//即将到期站点数 //即将到期站点数
const weekExpireSiteParam: SiteSearchParam = new SiteSearchParam(); const weekExpireSiteParam: SiteSearchParam = new SiteSearchParam();
@@ -54,7 +62,7 @@ export class StatServiceImplService {
expireTimes[1] = DateUtils.getDateAddDay(7); expireTimes[1] = DateUtils.getDateAddDay(7);
weekExpireSiteParam.status = 1; weekExpireSiteParam.status = 1;
weekExpireSiteParam.expireTime = expireTimes; weekExpireSiteParam.expireTime = expireTimes;
weekExpireSiteParam.appType = AppTypeEnum.path.basename(SITE); weekExpireSiteParam.appType = AppTypeEnum.basename(SITE);
statToDayVo.weekExpireSiteCount = this.siteService.getSiteCountByCondition(weekExpireSiteParam); statToDayVo.weekExpireSiteCount = this.siteService.getSiteCountByCondition(weekExpireSiteParam);
/** /**
@@ -103,9 +111,9 @@ export class StatServiceImplService {
*/ */
const memberStat: StatTypeVo = new StatTypeVo(); const memberStat: StatTypeVo = new StatTypeVo();
const sexlist: string[] = []; const sexlist: string[] = [];
sexlist.push(SexEnum.path.basename(MAN)); sexlist.push(SexEnum.basename(MAN));
sexlist.push(SexEnum.path.basename(WOMAN)); sexlist.push(SexEnum.basename(WOMAN));
sexlist.push(SexEnum.path.basename(UNKNOWN)); sexlist.push(SexEnum.basename(UNKNOWN));
const sexCountList: number[] = []; const sexCountList: number[] = [];
const sexMemberParam: MemberStatSearchParam = new MemberStatSearchParam(); const sexMemberParam: MemberStatSearchParam = new MemberStatSearchParam();

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

@@ -2,6 +2,8 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { SysAgreementListVo } from '../../../../dtos/admin/sys/vo/sys-agreement-list-vo.dto';
import { SysAgreementInfoVo } from '../../../../dtos/admin/sys/vo/sys-agreement-info-vo.dto';
@Injectable() @Injectable()
export class SysAgreementServiceImplService { export class SysAgreementServiceImplService {

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

@@ -3,8 +3,11 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from '@wwjBoot';
import * as path from 'path'; import * as path from 'path';
import { PageParamDto } from '../dtos/page-param.dto'; import { SysAreaByCodeVo } from '../../../../dtos/admin/sys/vo/sys-area-by-code-vo.dto';
import { SysAreaSearchParamDto } from '../dtos/sys-area-search-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysAreaSearchParam } from '../../../../dtos/admin/sys/param/sys-area-search-param.dto';
import { SysAreaListVo } from '../../../../dtos/api/sys/vo/sys-area-list-vo.dto';
import { SysMapVo } from '../../../../dtos/admin/sys/vo/sys-map-vo.dto';
@Injectable() @Injectable()
export class SysAreaServiceImplService { export class SysAreaServiceImplService {

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

@@ -3,13 +3,15 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import * as path from 'path'; import * as path from 'path';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysAttachmentSearchParamDto } from '../dtos/sys-attachment-search-param.dto'; import { SysAttachmentSearchParam } from '../../../../dtos/admin/sys/param/sys-attachment-search-param.dto';
import { AttachmentUploadParamDto } from '../dtos/attachment-upload-param.dto'; import { SysAttachmentListVo } from '../../../../dtos/admin/sys/vo/sys-attachment-list-vo.dto';
import { SysAttachmentMoveParamDto } from '../dtos/sys-attachment-move-param.dto'; import { AttachmentUploadParam } from '../../../../dtos/admin/sys/param/attachment-upload-param.dto';
import { SysAttachmentDelParamDto } from '../dtos/sys-attachment-del-param.dto'; import { SysAttachmentMoveParam } from '../../../../dtos/admin/sys/param/sys-attachment-move-param.dto';
import { SysAttachmentCategorySearchParamDto } from '../dtos/sys-attachment-category-search-param.dto'; import { SysAttachmentDelParam } from '../../../../dtos/admin/sys/param/sys-attachment-del-param.dto';
import { SysAttachmentCategoryParamDto } from '../dtos/sys-attachment-category-param.dto'; import { SysAttachmentCategorySearchParam } from '../../../../dtos/admin/sys/param/sys-attachment-category-search-param.dto';
import { SysAttachmentCategoryListVo } from '../../../../dtos/admin/sys/vo/sys-attachment-category-list-vo.dto';
import { SysAttachmentCategoryParam } from '../../../../dtos/admin/sys/param/sys-attachment-category-param.dto';
@Injectable() @Injectable()
export class SysAttachmentServiceImplService { export class SysAttachmentServiceImplService {

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

@@ -3,13 +3,14 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils } from '@wwjBoot';
import * as fs from 'fs'; import * as fs from 'fs';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysBackupRecordsSearchParamDto } from '../dtos/sys-backup-records-search-param.dto'; import { SysBackupRecordsSearchParam } from '../../../../dtos/admin/sys/param/sys-backup-records-search-param.dto';
import { SysBackupRecordsParamDto } from '../dtos/sys-backup-records-param.dto'; import { SysBackupRecordsListVo } from '../../../../dtos/admin/sys/vo/sys-backup-records-list-vo.dto';
import { SysBackupRecordsDelParamDto } from '../dtos/sys-backup-records-del-param.dto'; import { SysBackupRecordsParam } from '../../../../dtos/admin/sys/param/sys-backup-records-param.dto';
import { BackupRestoreParamDto } from '../dtos/backup-restore-param.dto'; import { SysBackupRecordsDelParam } from '../../../../dtos/admin/sys/param/sys-backup-records-del-param.dto';
import { BackupTaskVoDto } from '../dtos/backup-task-vo.dto'; import { BackupRestoreParam } from '../../../../dtos/admin/sys/param/backup-restore-param.dto';
import { Dto } from '../dtos/.dto'; import { BackupTaskVo } from '../dtos/backup-task-vo.dto';
import { } from '../dtos/.dto';
@Injectable() @Injectable()
export class SysBackupRecordsServiceImplService { export class SysBackupRecordsServiceImplService {
@@ -151,7 +152,7 @@ export class SysBackupRecordsServiceImplService {
vo.executed.add(step); vo.executed.add(step);
} }
try { try {
const param: Record<String, Object> = null; const param: Record<string, Object> = null;
param = (Record<String, Object>) dynamicMethodCall(step, vo); param = (Record<String, Object>) dynamicMethodCall(step, vo);
if (param != null) { if (param != null) {
vo.params = param; vo.params = param;
@@ -204,7 +205,7 @@ export class SysBackupRecordsServiceImplService {
vo.executed.add(step); vo.executed.add(step);
} }
try { try {
const param: Record<String, Object> = null; const param: Record<string, Object> = null;
param = (Record<String, Object>) dynamicMethodCall(step, vo); param = (Record<String, Object>) dynamicMethodCall(step, vo);
if (param != null) { if (param != null) {
vo.params = param; vo.params = param;

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

@@ -2,12 +2,12 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { SysWebsiteParamDto } from '../dtos/sys-website-param.dto'; import { SysWebsiteParam } from '../../../../dtos/admin/sys/param/sys-website-param.dto';
import { SysCopyRightParamDto } from '../dtos/sys-copy-right-param.dto'; import { SysCopyRightParam } from '../../../../dtos/admin/sys/param/sys-copy-right-param.dto';
import { SysMapParamDto } from '../dtos/sys-map-param.dto'; import { SysMapParam } from '../../../../dtos/admin/sys/param/sys-map-param.dto';
import { SysDeveloperTokenParamDto } from '../dtos/sys-developer-token-param.dto'; import { SysDeveloperTokenParam } from '../../../../dtos/admin/sys/param/sys-developer-token-param.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; import { JSONObject } from '../dtos/j-s-o-n-object.dto';
import { SysLoginConfigParamDto } from '../dtos/sys-login-config-param.dto'; import { SysLoginConfigParam } from '../../../../dtos/admin/sys/param/sys-login-config-param.dto';
@Injectable() @Injectable()
export class SysConfigServiceImplService { export class SysConfigServiceImplService {

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

@@ -2,10 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysExportSearchParamDto } from '../dtos/sys-export-search-param.dto'; import { SysExportSearchParam } from '../../../../dtos/admin/sys/param/sys-export-search-param.dto';
import { Map<StringDto } from '../dtos/map<-string.dto'; import { SysExportListVo } from '../../../../dtos/admin/sys/vo/sys-export-list-vo.dto';
import { Object>Dto } from '../dtos/object>.dto'; import { Map<String } from '../dtos/map<-string.dto';
import { Object> } from '../dtos/object>.dto';
@Injectable() @Injectable()
export class SysExportServiceImplService { export class SysExportServiceImplService {

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

@@ -2,8 +2,8 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import { SysMenuParamDto } from '../dtos/sys-menu-param.dto'; import { SysMenuInfoVo } from '../../../../dtos/admin/sys/vo/sys-menu-info-vo.dto';
import { List<String>Dto } from '../dtos/list<-string>.dto'; import { SysMenuParam } from '../../../../dtos/admin/sys/param/sys-menu-param.dto';
@Injectable() @Injectable()
export class SysMenuServiceImplService { export class SysMenuServiceImplService {

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

@@ -2,8 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysNoticeLogSearchParamDto } from '../dtos/sys-notice-log-search-param.dto'; import { SysNoticeLogSearchParam } from '../../../../dtos/admin/sys/param/sys-notice-log-search-param.dto';
import { NoticeEnumListVo } from '../../../../dtos/notice/vo/notice-enum-list-vo.dto';
import { SysNoticeLogListVo } from '../../../../dtos/admin/sys/vo/sys-notice-log-list-vo.dto';
import { SysNoticeLogInfoVo } from '../../../../dtos/admin/sys/vo/sys-notice-log-info-vo.dto';
@Injectable() @Injectable()
export class SysNoticeLogServiceImplService { export class SysNoticeLogServiceImplService {
@@ -26,7 +29,7 @@ export class SysNoticeLogServiceImplService {
if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper, "create_time", searchParam.createTime); if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper, "create_time", searchParam.createTime);
queryWrapper.orderByDesc("id"); queryWrapper.orderByDesc("id");
const noticeEnum: Record<String, NoticeEnumListVo> = NoticeEnum.notice; const noticeEnum: Record<string, NoticeEnumListVo> = NoticeEnum.notice;
[SysNoticeLog[], number] iPage = this.sysNoticeLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); [SysNoticeLog[], number] iPage = this.sysNoticeLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
const list: SysNoticeLogListVo[] = []; const list: SysNoticeLogListVo[] = [];

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

@@ -2,9 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result } from '@wwjBoot'; import { QueueService, EventBus, Result } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysNoticeSearchParamDto } from '../dtos/sys-notice-search-param.dto'; import { SysNoticeSearchParam } from '../../../../dtos/admin/sys/param/sys-notice-search-param.dto';
import { SysNoticeParamDto } from '../dtos/sys-notice-param.dto'; import { SysNoticeListVo } from '../../../../dtos/admin/sys/vo/sys-notice-list-vo.dto';
import { SysNoticeInfoVo } from '../../../../dtos/admin/sys/vo/sys-notice-info-vo.dto';
import { SysNoticeParam } from '../../../../dtos/admin/sys/param/sys-notice-param.dto';
@Injectable() @Injectable()
export class SysNoticeServiceImplService { export class SysNoticeServiceImplService {

9
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-sms-log-service-impl.service.ts
View File

@@ -2,8 +2,11 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysNoticeSmsLogSearchParamDto } from '../dtos/sys-notice-sms-log-search-param.dto'; import { SysNoticeSmsLogSearchParam } from '../../../../dtos/core/notice/param/sys-notice-sms-log-search-param.dto';
import { NoticeEnumListVo } from '../../../../dtos/notice/vo/notice-enum-list-vo.dto';
import { SysNoticeSmsLogListVo } from '../../../../dtos/admin/sys/vo/sys-notice-sms-log-list-vo.dto';
import { SysNoticeSmsLogInfoVo } from '../../../../dtos/admin/sys/vo/sys-notice-sms-log-info-vo.dto';
@Injectable() @Injectable()
export class SysNoticeSmsLogServiceImplService { export class SysNoticeSmsLogServiceImplService {
@@ -28,7 +31,7 @@ export class SysNoticeSmsLogServiceImplService {
queryWrapper.orderByDesc("id"); queryWrapper.orderByDesc("id");
const smsTypeEnum: Record<string, any> = SmsTypeEnum.type; const smsTypeEnum: Record<string, any> = SmsTypeEnum.type;
const notice: Record<String, NoticeEnumListVo> = NoticeEnum.notice; const notice: Record<string, NoticeEnumListVo> = NoticeEnum.notice;
[SysNoticeSmsLog[], number] iPage = this.sysNoticeSmsLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); [SysNoticeSmsLog[], number] iPage = this.sysNoticeSmsLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
const list: SysNoticeSmsLogListVo[] = []; const list: SysNoticeSmsLogListVo[] = [];

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

@@ -3,12 +3,16 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import * as path from 'path'; import * as path from 'path';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysPosterSearchParamDto } from '../dtos/sys-poster-search-param.dto'; import { SysPosterSearchParam } from '../../../../dtos/admin/sys/param/sys-poster-search-param.dto';
import { SysPosterParamDto } from '../dtos/sys-poster-param.dto'; import { SysPosterListVo } from '../../../../dtos/admin/sys/vo/sys-poster-list-vo.dto';
import { SysPosterInitParamDto } from '../dtos/sys-poster-init-param.dto'; import { SysPosterInfoVo } from '../../../../dtos/admin/sys/vo/sys-poster-info-vo.dto';
import { SysPosterTemplateSearchParamDto } from '../dtos/sys-poster-template-search-param.dto'; import { SysPosterParam } from '../../../../dtos/admin/sys/param/sys-poster-param.dto';
import { PreviewPosterParamDto } from '../dtos/preview-poster-param.dto'; import { SysPosterInitParam } from '../../../../dtos/admin/sys/param/sys-poster-init-param.dto';
import { SysPosterInitVo } from '../../../../dtos/admin/sys/vo/sys-poster-init-vo.dto';
import { SysPosterTemplateSearchParam } from '../../../../dtos/admin/sys/param/sys-poster-template-search-param.dto';
import { PreviewPosterParam } from '../../../../dtos/admin/sys/param/preview-poster-param.dto';
import { GetPosterParam } from '../../../../dtos/core/poster/param/get-poster-param.dto';
@Injectable() @Injectable()
export class SysPosterServiceImplService { export class SysPosterServiceImplService {
@@ -212,7 +216,7 @@ export class SysPosterServiceImplService {
getPosterParam.type = param.type; getPosterParam.type = param.type;
getPosterParam.siteId = this.requestContext.siteId; getPosterParam.siteId = this.requestContext.siteId;
getPosterParam.channel = ObjectUtil.defaultIfNull(param.channel, "h5"); getPosterParam.channel = ObjectUtil.defaultIfNull(param.channel, "h5");
const posterParam: Record<String, Object> = {}; const posterParam: Record<string, Object> = {};
posterParam.put("mode", "preview"); posterParam.put("mode", "preview");
getPosterParam.param = posterParam; getPosterParam.param = posterParam;
getPosterParam.isThrowException = true; getPosterParam.isThrowException = true;

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

@@ -3,12 +3,15 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import * as path from 'path'; import * as path from 'path';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysPrinterSearchParamDto } from '../dtos/sys-printer-search-param.dto'; import { SysPrinterSearchParam } from '../../../../dtos/admin/sys/param/sys-printer-search-param.dto';
import { SysPrinterParamDto } from '../dtos/sys-printer-param.dto'; import { SysPrinterListVo } from '../../../../dtos/admin/sys/vo/sys-printer-list-vo.dto';
import { SysPrinterModifyStatusParamDto } from '../dtos/sys-printer-modify-status-param.dto'; import { SysPrinterInfoVo } from '../../../../dtos/admin/sys/vo/sys-printer-info-vo.dto';
import { SysPrinterPrintTicketParamDto } from '../dtos/sys-printer-print-ticket-param.dto'; import { SysPrinterParam } from '../../../../dtos/admin/sys/param/sys-printer-param.dto';
import { SysPrinterDto } from '../dtos/sys-printer.dto'; 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';
@Injectable() @Injectable()
export class SysPrinterServiceImplService { export class SysPrinterServiceImplService {

8
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-template-service-impl.service.ts
View File

@@ -2,9 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysPrinterTemplateSearchParamDto } from '../dtos/sys-printer-template-search-param.dto'; import { SysPrinterTemplateSearchParam } from '../../../../dtos/admin/sys/param/sys-printer-template-search-param.dto';
import { SysPrinterTemplateParamDto } from '../dtos/sys-printer-template-param.dto'; import { SysPrinterTemplateListVo } from '../../../../dtos/admin/sys/vo/sys-printer-template-list-vo.dto';
import { SysPrinterTemplateInfoVo } from '../../../../dtos/admin/sys/vo/sys-printer-template-info-vo.dto';
import { SysPrinterTemplateParam } from '../../../../dtos/admin/sys/param/sys-printer-template-param.dto';
@Injectable() @Injectable()
export class SysPrinterTemplateServiceImplService { export class SysPrinterTemplateServiceImplService {

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

@@ -2,10 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, StringUtils, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, StringUtils, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysRoleSearchParamDto } from '../dtos/sys-role-search-param.dto'; import { SysRoleSearchParam } from '../../../../dtos/admin/sys/param/sys-role-search-param.dto';
import { SysRoleParamDto } from '../dtos/sys-role-param.dto'; import { SysRoleListVo } from '../../../../dtos/admin/sys/vo/sys-role-list-vo.dto';
import { List<String>Dto } from '../dtos/list<-string>.dto'; import { SysRoleInfoVo } from '../../../../dtos/admin/sys/vo/sys-role-info-vo.dto';
import { SysRoleParam } from '../../../../dtos/admin/sys/param/sys-role-param.dto';
@Injectable() @Injectable()
export class SysRoleServiceImplService { export class SysRoleServiceImplService {

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

@@ -3,13 +3,17 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import * as path from 'path'; import * as path from 'path';
import { ApplicationContextDto } from '../dtos/application-context.dto'; import { ApplicationContext } from '../dtos/application-context.dto';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysScheduleSearchParamDto } from '../dtos/sys-schedule-search-param.dto'; import { SysScheduleSearchParam } from '../../../../dtos/admin/sys/param/sys-schedule-search-param.dto';
import { SysScheduleStatusParamDto } from '../dtos/sys-schedule-status-param.dto'; import { SysScheduleListVo } from '../../../../dtos/admin/sys/vo/sys-schedule-list-vo.dto';
import { SysScheduleParamDto } from '../dtos/sys-schedule-param.dto'; import { SysScheduleInfoVo } from '../../../../dtos/admin/sys/vo/sys-schedule-info-vo.dto';
import { SysScheduleLogSearchParamDto } from '../dtos/sys-schedule-log-search-param.dto'; import { SysScheduleStatusParam } from '../../../../dtos/admin/sys/param/sys-schedule-status-param.dto';
import { SysScheduleLogDto } from '../dtos/sys-schedule-log.dto'; import { SysScheduleParam } from '../../../../dtos/admin/sys/param/sys-schedule-param.dto';
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';
@Injectable() @Injectable()
export class SysScheduleServiceImplService { export class SysScheduleServiceImplService {
@@ -30,7 +34,7 @@ export class SysScheduleServiceImplService {
*/ */
async init(): Promise<any> { async init(): Promise<any> {
// 通过 ApplicationContext 获取所有 IJobProvider 实现 // 通过 ApplicationContext 获取所有 IJobProvider 实现
const providers: Record<String, IJobProvider> = applicationContext.getBeansOfType(IJobProvider.class); const providers: Record<string, IJobProvider> = applicationContext.getBeansOfType(IJobProvider.class);
log.info("Loaded job provider count: {}", providers.length); log.info("Loaded job provider count: {}", providers.length);
for (const provider of providers.values()) { for (const provider of providers.values()) {
log.info("Loaded job provider: {}", provider.getClass().name); log.info("Loaded job provider: {}", provider.getClass().name);

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

@@ -3,8 +3,11 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result } from '@wwjBoot'; import { QueueService, EventBus, Result } from '@wwjBoot';
import * as path from 'path'; import * as path from 'path';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysUpgradeRecordsSearchParamDto } from '../dtos/sys-upgrade-records-search-param.dto'; import { SysUpgradeRecordsSearchParam } from '../dtos/sys-upgrade-records-search-param.dto';
import { SysUpgradeRecordsListVo } from '../dtos/sys-upgrade-records-list-vo.dto';
import { SysUpgradeRecordsParam } from '../dtos/sys-upgrade-records-param.dto';
import { SysUpgradeRecordsDelParam } from '../dtos/sys-upgrade-records-del-param.dto';
@Injectable() @Injectable()
export class SysUpgradeRecordsServiceImplService { export class SysUpgradeRecordsServiceImplService {

6
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-log-service-impl.service.ts
View File

@@ -2,8 +2,10 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysUserLogSearchParamDto } from '../dtos/sys-user-log-search-param.dto'; import { SysUserLogSearchParam } from '../../../../dtos/admin/sys/param/sys-user-log-search-param.dto';
import { SysUserLogListVo } from '../../../../dtos/admin/sys/vo/sys-user-log-list-vo.dto';
import { SysUserLogInfoVo } from '../../../../dtos/admin/sys/vo/sys-user-log-info-vo.dto';
@Injectable() @Injectable()
export class SysUserLogServiceImplService { export class SysUserLogServiceImplService {

8
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-role-service-impl.service.ts
View File

@@ -2,9 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysUserRoleSearchParamDto } from '../dtos/sys-user-role-search-param.dto'; import { SysUserRoleSearchParam } from '../../../../dtos/admin/sys/param/sys-user-role-search-param.dto';
import { SysUserRoleParamDto } from '../dtos/sys-user-role-param.dto'; import { SysUserRoleListVo } from '../../../../dtos/admin/sys/vo/sys-user-role-list-vo.dto';
import { SysUserRoleInfoVo } from '../../../../dtos/admin/sys/vo/sys-user-role-info-vo.dto';
import { SysUserRoleParam } from '../../../../dtos/admin/sys/param/sys-user-role-param.dto';
@Injectable() @Injectable()
export class SysUserRoleServiceImplService { export class SysUserRoleServiceImplService {

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

@@ -2,12 +2,19 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, StringUtils, AppConfigService, CommonUtils } from '@wwjBoot'; import { QueueService, EventBus, Result, StringUtils, AppConfigService, CommonUtils } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysUserSearchParamDto } from '../dtos/sys-user-search-param.dto'; import { SysUserSearchParam } from '../../../../dtos/admin/sys/param/sys-user-search-param.dto';
import { SysUserParamDto } from '../dtos/sys-user-param.dto'; import { SysUserListVo } from '../../../../dtos/admin/sys/vo/sys-user-list-vo.dto';
import { SiteUserParamDto } from '../dtos/site-user-param.dto'; import { SysUserDetailVo } from '../../../../dtos/admin/sys/vo/sys-user-detail-vo.dto';
import { SysUserCreateSiteLimitAddParamDto } from '../dtos/sys-user-create-site-limit-add-param.dto'; import { SysUserSiteRoleVo } from '../../../../dtos/admin/sys/vo/sys-user-site-role-vo.dto';
import { SysUserCreateSiteLimitEditParamDto } from '../dtos/sys-user-create-site-limit-edit-param.dto'; import { SysUserParam } from '../../../../dtos/admin/sys/param/sys-user-param.dto';
import { SysCreateSiteLimitParam } from '../../../../dtos/admin/sys/param/sys-create-site-limit-param.dto';
import { SysUserInfoVo } from '../../../../dtos/admin/sys/vo/sys-user-info-vo.dto';
import { SiteUserParam } from '../../../../dtos/admin/site/param/site-user-param.dto';
import { SysUserRoleParam } from '../../../../dtos/admin/sys/param/sys-user-role-param.dto';
import { SysUserCreateSiteLimitVo } from '../../../../dtos/admin/sys/vo/sys-user-create-site-limit-vo.dto';
import { SysUserCreateSiteLimitAddParam } from '../../../../dtos/admin/sys/param/sys-user-create-site-limit-add-param.dto';
import { SysUserCreateSiteLimitEditParam } from '../../../../dtos/admin/sys/param/sys-user-create-site-limit-edit-param.dto';
@Injectable() @Injectable()
export class SysUserServiceImplService { export class SysUserServiceImplService {

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

@@ -2,8 +2,11 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from '@wwjBoot';
import { SpreadQrcodeParamDto } from '../dtos/spread-qrcode-param.dto'; import { StatSystemVo } from '../../../../dtos/admin/stat/vo/stat-system-vo.dto';
import { FileDto } from '../dtos/file.dto'; import { StatVersionVo } from '../../../../dtos/admin/stat/vo/stat-version-vo.dto';
import { SpreadQrcodeParam } from '../../../../dtos/admin/sys/param/spread-qrcode-param.dto';
import { SpreadQrcodeVo } from '../../../../dtos/admin/sys/vo/spread-qrcode-vo.dto';
import { File } from '../dtos/file.dto';
@Injectable() @Injectable()
export class SystemServiceImplService { export class SystemServiceImplService {
@@ -43,7 +46,7 @@ export class SystemServiceImplService {
const vo: SpreadQrcodeVo = new SpreadQrcodeVo(); const vo: SpreadQrcodeVo = new SpreadQrcodeVo();
try { try {
const data: Record<String, Object> = {}; const data: Record<string, Object> = {};
for (SpreadQrcodeParam.Param qrcodeParam : param.params) { for (SpreadQrcodeParam.Param qrcodeParam : param.params) {
const jsonArray: JSONArray = JSONUtil.parseArray(qrcodeParam); const jsonArray: JSONArray = JSONUtil.parseArray(qrcodeParam);
const jsonObject: Record<string, any> = JsonUtils.parseObject<any>(jsonArray); const jsonObject: Record<string, any> = JsonUtils.parseObject<any>(jsonArray);

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

@@ -3,10 +3,12 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils } from '@wwjBoot';
import * as fs from 'fs'; import * as fs from 'fs';
import { @LazyDto } from '../dtos/@-lazy.dto'; import { @Lazy } from '../dtos/@-lazy.dto';
import { UpgradeParamDto } from '../dtos/upgrade-param.dto'; import { UpgradeContentVo } from '../dtos/upgrade-content-vo.dto';
import { UpgradeTaskVoDto } from '../dtos/upgrade-task-vo.dto'; import { UpgradeParam } from '../dtos/upgrade-param.dto';
import { Dto } from '../dtos/.dto'; import { UpgradeTaskVo } from '../dtos/upgrade-task-vo.dto';
import { SysUpgradeRecordsParam } from '../dtos/sys-upgrade-records-param.dto';
import { } from '../dtos/.dto';
@Injectable() @Injectable()
export class UpgradeServiceImplService { export class UpgradeServiceImplService {
@@ -91,7 +93,7 @@ export class UpgradeServiceImplService {
const apps: Map[] = []; const apps: Map[] = [];
if ((!addon || addon.length === 0)) { if ((!addon || addon.length === 0)) {
const query: Record<String, Object> = {}; const query: Record<string, Object> = {};
query.put("product_key", instance.productKey); query.put("product_key", instance.productKey);
query.put("app_key", this.appConfig.appKey); query.put("app_key", this.appConfig.appKey);
query.put("version", this.appConfig.version); query.put("version", this.appConfig.version);
@@ -99,7 +101,7 @@ export class UpgradeServiceImplService {
} else { } else {
for (const key of addon.split(",")) { for (const key of addon.split(",")) {
const addonModel: Addon = this.addonRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).select("version,type")); const addonModel: Addon = this.addonRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).select("version,type"));
const query: Record<String, Object> = {}; const query: Record<string, Object> = {};
query.put("product_key", instance.productKey); query.put("product_key", instance.productKey);
query.put("app_key", key); query.put("app_key", key);
query.put("version", addonModel.version); query.put("version", addonModel.version);
@@ -143,7 +145,7 @@ export class UpgradeServiceImplService {
const instance: NiucloudUtils = NiucloudUtils.instance; const instance: NiucloudUtils = NiucloudUtils.instance;
// 获取下载token // 获取下载token
const actionQuery: Record<String, Object> = new const query: Record<>(); const actionQuery: Record<string, Object> = new const query: Record<>();
actionQuery.put("data[product_key]", instance.productKey); actionQuery.put("data[product_key]", instance.productKey);
actionQuery.put("data[framework_version]", this.appConfig.version); actionQuery.put("data[framework_version]", this.appConfig.version);
actionQuery.put("data[app_key]", upgradeContent.getContent().get(0).getApp().appKey); actionQuery.put("data[app_key]", upgradeContent.getContent().get(0).getApp().appKey);
@@ -252,7 +254,7 @@ export class UpgradeServiceImplService {
vo.getLog().add(vo.getSteps().get(step).title); vo.getLog().add(vo.getSteps().get(step).title);
} }
try { try {
const param: Record<String, Object> = null; const param: Record<string, Object> = null;
param = (Record<String, Object>) dynamicMethodCall(step, vo); param = (Record<String, Object>) dynamicMethodCall(step, vo);
if (param != null) { if (param != null) {
vo.params = param; vo.params = param;

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

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

9
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verifier-service-impl.service.ts
View File

@@ -2,9 +2,12 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { VerifierSearchParamDto } from '../dtos/verifier-search-param.dto'; import { VerifierSearchParam } from '../../../../dtos/admin/verify/param/verifier-search-param.dto';
import { VerifierParamDto } from '../dtos/verifier-param.dto'; import { VerifierVo } from '../../../../dtos/admin/verify/vo/verifier-vo.dto';
import { VerifierListVo } from '../../../../dtos/admin/verify/vo/verifier-list-vo.dto';
import { MemberBriefInfoVo } from '../../../../dtos/admin/member/vo/member-brief-info-vo.dto';
import { VerifierParam } from '../../../../dtos/admin/verify/param/verifier-param.dto';
@Injectable() @Injectable()
export class VerifierServiceImplService { export class VerifierServiceImplService {

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

@@ -2,8 +2,12 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { VerifySearchParamDto } from '../dtos/verify-search-param.dto'; import { VerifySearchParam } from '../../../../dtos/admin/verify/param/verify-search-param.dto';
import { VerifyVo } from '../../../../dtos/admin/verify/vo/verify-vo.dto';
import { VerifyListVo } from '../../../../dtos/admin/verify/vo/verify-list-vo.dto';
import { MemberBriefInfoVo } from '../../../../dtos/admin/member/vo/member-brief-info-vo.dto';
import { VerifyInfoVo } from '../../../../dtos/admin/verify/vo/verify-info-vo.dto';
@Injectable() @Injectable()
export class VerifyServiceImplService { export class VerifyServiceImplService {

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

@@ -2,10 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import { WeappConfigParamDto } from '../dtos/weapp-config-param.dto'; import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto';
import { SetDomainParamDto } from '../dtos/set-domain-param.dto'; import { WeappConfigParam } from '../../../../dtos/core/weapp/param/weapp-config-param.dto';
import { JSONObjectDto } from '../dtos/j-s-o-n-object.dto'; import { SetDomainParam } from '../dtos/set-domain-param.dto';
import { WeappConfigVoDto } from '../dtos/weapp-config-vo.dto'; import { JSONObject } from '../dtos/j-s-o-n-object.dto';
import { SceneDomainVo } from '../dtos/scene-domain-vo.dto';
@Injectable() @Injectable()
export class WeappConfigServiceImplService { export class WeappConfigServiceImplService {

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

@@ -2,8 +2,9 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { WeappTemplateSyncParamDto } from '../dtos/weapp-template-sync-param.dto'; import { AddonNoticeListVo } from '../../../../dtos/core/notice/vo/addon-notice-list-vo.dto';
import { List<Integer>Dto } from '../dtos/list<-integer>.dto'; import { NoticeInfoVo } from '../../../../dtos/core/notice/vo/notice-info-vo.dto';
import { WeappTemplateSyncParam } from '../../../../dtos/admin/weapp/param/weapp-template-sync-param.dto';
@Injectable() @Injectable()
export class WeappTemplateServiceImplService { export class WeappTemplateServiceImplService {
@@ -34,7 +35,7 @@ export class WeappTemplateServiceImplService {
* sync * sync
*/ */
async sync(param: WeappTemplateSyncParam): Promise<any> { async sync(param: WeappTemplateSyncParam): Promise<any> {
const list: Record<String, NoticeInfoVo> = this.coreNoticeService.getList(this.requestContext.siteId, param.keys); const list: Record<string, NoticeInfoVo> = this.coreNoticeService.getList(this.requestContext.siteId, param.keys);
const keys: string[] = [param.getKeys(]); const keys: string[] = [param.getKeys(]);
for (const item of list.values()) { for (const item of list.values()) {

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

@@ -3,8 +3,11 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import * as fs from 'fs'; import * as fs from 'fs';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { WeappVersionAddParamDto } from '../dtos/weapp-version-add-param.dto'; import { WeappVersionListVo } from '../../../../dtos/admin/weapp/vo/weapp-version-list-vo.dto';
import { WeappVersionAddParam } from '../../../../dtos/admin/weapp/param/weapp-version-add-param.dto';
import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto';
import { WeappUploadParam } from '../../../../dtos/core/weapp/param/weapp-upload-param.dto';
@Injectable() @Injectable()
export class WeappVersionServiceImplService { export class WeappVersionServiceImplService {

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

@@ -2,7 +2,9 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { WechatConfigParamDto } from '../dtos/wechat-config-param.dto'; import { WechatConfigParam } from '../../../../dtos/core/wechat/param/wechat-config-param.dto';
import { SceneDomainVo } from '../dtos/scene-domain-vo.dto';
import { WechatStaticInfoVo } from '../../../../dtos/admin/wechat/vo/wechat-static-info-vo.dto';
@Injectable() @Injectable()
export class WechatConfigServiceImplService { export class WechatConfigServiceImplService {

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

@@ -2,9 +2,13 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { WechatMediaSearchParamDto } from '../dtos/wechat-media-search-param.dto'; import { WechatMediaSearchParam } from '../../../../dtos/admin/wechat/param/wechat-media-search-param.dto';
import { MultipartFileDto } from '../dtos/multipart-file.dto'; import { WechatMediaListVo } from '../../../../dtos/admin/wechat/vo/wechat-media-list-vo.dto';
import { MultipartFile } from '../dtos/multipart-file.dto';
import { AttachmentUploadParam } from '../../../../dtos/admin/sys/param/attachment-upload-param.dto';
import { AttachmentUploadVo } from '../../../../dtos/admin/sys/vo/attachment-upload-vo.dto';
import { WechatMediaInfoVo } from '../../../../dtos/admin/wechat/vo/wechat-media-info-vo.dto';
@Injectable() @Injectable()
export class WechatMediaServiceImplService { export class WechatMediaServiceImplService {

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

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, RequestContextService } from '@wwjBoot';
import { JSONArrayDto } from '../dtos/j-s-o-n-array.dto'; import { JSONArray } from '../dtos/j-s-o-n-array.dto';
@Injectable() @Injectable()
export class WechatMenuServiceImplService { export class WechatMenuServiceImplService {

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

@@ -3,11 +3,13 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import * as path from 'path'; import * as path from 'path';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { WechatReplySearchParamDto } from '../dtos/wechat-reply-search-param.dto'; import { WechatReplySearchParam } from '../../../../dtos/admin/wechat/param/wechat-reply-search-param.dto';
import { WechatReplyParamDto } from '../dtos/wechat-reply-param.dto'; import { WechatReplyListVo } from '../../../../dtos/admin/wechat/vo/wechat-reply-list-vo.dto';
import { WechatDefaultReplyParamDto } from '../dtos/wechat-default-reply-param.dto'; import { WechatReplyInfoVo } from '../../../../dtos/admin/wechat/vo/wechat-reply-info-vo.dto';
import { WechatSubscribeReplyParamDto } from '../dtos/wechat-subscribe-reply-param.dto'; import { WechatReplyParam } from '../../../../dtos/admin/wechat/param/wechat-reply-param.dto';
import { WechatDefaultReplyParam } from '../../../../dtos/admin/wechat/param/wechat-default-reply-param.dto';
import { WechatSubscribeReplyParam } from '../../../../dtos/admin/wechat/param/wechat-subscribe-reply-param.dto';
@Injectable() @Injectable()
export class WechatReplyServiceImplService { export class WechatReplyServiceImplService {

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

@@ -2,8 +2,9 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { WechatTemplateSyncParamDto } from '../dtos/wechat-template-sync-param.dto'; import { AddonNoticeListVo } from '../../../../dtos/core/notice/vo/addon-notice-list-vo.dto';
import { List<String>Dto } from '../dtos/list<-string>.dto'; import { NoticeInfoVo } from '../../../../dtos/core/notice/vo/notice-info-vo.dto';
import { WechatTemplateSyncParam } from '../../../../dtos/admin/wechat/param/wechat-template-sync-param.dto';
@Injectable() @Injectable()
export class WechatTemplateServiceImplService { export class WechatTemplateServiceImplService {
@@ -34,7 +35,7 @@ export class WechatTemplateServiceImplService {
* sync * sync
*/ */
async sync(param: WechatTemplateSyncParam): Promise<any> { async sync(param: WechatTemplateSyncParam): Promise<any> {
const list: Record<String, NoticeInfoVo> = this.coreNoticeService.getList(this.requestContext.siteId, param.keys); const list: Record<string, NoticeInfoVo> = this.coreNoticeService.getList(this.requestContext.siteId, param.keys);
const keys: string[] = [param.getKeys(]); const keys: string[] = [param.getKeys(]);
for (const item of list.values()) { for (const item of list.values()) {

5
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-config-service-impl.service.ts
View File

@@ -2,8 +2,7 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result } from '@wwjBoot'; import { QueueService, EventBus, Result } from '@wwjBoot';
import * as path from 'path'; import { OplatformConfigParam } from '../../../../dtos/admin/wxoplatform/param/oplatform-config-param.dto';
import { OplatformConfigParamDto } from '../dtos/oplatform-config-param.dto';
@Injectable() @Injectable()
export class OplatformConfigServiceImplService { export class OplatformConfigServiceImplService {
@@ -22,7 +21,7 @@ export class OplatformConfigServiceImplService {
* getWxOplatformConfig * getWxOplatformConfig
*/ */
async getWxOplatformConfig(): Promise<any> { async getWxOplatformConfig(): Promise<any> {
const jsonObject: Record<string, any> = this.coreConfigService.getConfigValue(RequestUtils.defaultSiteId(), ConfigKeyEnum.path.basename(WXOPLATFORM)); const jsonObject: Record<string, any> = this.coreConfigService.getConfigValue(RequestUtils.defaultSiteId(), ConfigKeyEnum.basename(WXOPLATFORM));
const configJsonObject: Record<string, any> = new Record<string, any>(); const configJsonObject: Record<string, any> = new Record<string, any>();
configJsonObject.set("app_id", jsonObject.getStr("app_id", "")); configJsonObject.set("app_id", jsonObject.getStr("app_id", ""));
configJsonObject.set("app_secret", jsonObject.getStr("app_secret", "")); configJsonObject.set("app_secret", jsonObject.getStr("app_secret", ""));

6
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-server-service-impl.service.ts
View File

@@ -2,8 +2,10 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, StringUtils } from '@wwjBoot'; import { QueueService, EventBus, Result, StringUtils } from '@wwjBoot';
import { OplatformServerParamDto } from '../dtos/oplatform-server-param.dto'; import { OplatformServerParam } from '../../../../dtos/admin/wxoplatform/param/oplatform-server-param.dto';
import { WxMpXmlMessageDto } from '../dtos/wx-mp-xml-message.dto'; import { AuthorizationParam } from '../../../../dtos/admin/wxoplatform/param/authorization-param.dto';
import { WxMpXmlMessage } from '../dtos/wx-mp-xml-message.dto';
import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto';
@Injectable() @Injectable()
export class OplatformServerServiceImplService { export class OplatformServerServiceImplService {

18
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-service-impl.service.ts
View File

@@ -2,12 +2,14 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, CommonUtils, RequestContextService } from '@wwjBoot';
import * as path from 'path'; import { AuthorizationParam } from '../../../../dtos/admin/wxoplatform/param/authorization-param.dto';
import { AuthorizationParamDto } from '../dtos/authorization-param.dto'; import { WeappConfigParam } from '../../../../dtos/core/weapp/param/weapp-config-param.dto';
import { WxOpenAuthorizerInfoDto } from '../dtos/wx-open-authorizer-info.dto'; import { WechatConfigParam } from '../../../../dtos/core/wechat/param/wechat-config-param.dto';
import { WxOpenAuthorizationInfoDto } from '../dtos/wx-open-authorization-info.dto'; import { WxOpenAuthorizerInfo } from '../dtos/wx-open-authorizer-info.dto';
import { PageParamDto } from '../dtos/page-param.dto'; import { WxOpenAuthorizationInfo } from '../dtos/wx-open-authorization-info.dto';
import { IOplatformAuthRecordParamDto } from '../dtos/i-oplatform-auth-record-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { IOplatformAuthRecordParam } from '../../../../dtos/admin/wxoplatform/param/i-oplatform-auth-record-param.dto';
import { OplatformRecordVo } from '../../../../dtos/admin/wxoplatform/vo/oplatform-record-vo.dto';
@Injectable() @Injectable()
export class OplatformServiceImplService { export class OplatformServiceImplService {
@@ -76,7 +78,7 @@ export class OplatformServiceImplService {
* clearAuthorization * clearAuthorization
*/ */
async clearAuthorization(appid: string): Promise<any> { async clearAuthorization(appid: string): Promise<any> {
const configKey: string[] = new String[]{ ConfigKeyEnum.path.basename(WECHAT), ConfigKeyEnum.path.basename(WEAPP), ConfigKeyEnum.path.basename(WEAPP_AUTHORIZATION_INFO), ConfigKeyEnum.path.basename(WECHAT_AUTHORIZATION_INFO)}; const configKey: string[] = new String[]{ ConfigKeyEnum.basename(WECHAT), ConfigKeyEnum.basename(WEAPP), ConfigKeyEnum.basename(WEAPP_AUTHORIZATION_INFO), ConfigKeyEnum.basename(WECHAT_AUTHORIZATION_INFO)};
this.sysConfigRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ }).in("config_key", configKey)); this.sysConfigRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ }).in("config_key", configKey));
this.coreConfigService.cacheClear(); this.coreConfigService.cacheClear();
} }
@@ -91,7 +93,7 @@ export class OplatformServiceImplService {
MPJLambdaWrapper<SysConfig> wrapper = new MPJLambdaWrapper<SysConfig>(); MPJLambdaWrapper<SysConfig> wrapper = new MPJLambdaWrapper<SysConfig>();
wrapper.select(SysConfig::getCreateTime,SysConfig::getAddon,SysConfig::getStatus,SysConfig::getConfigKey, SysConfig::getValue, SysConfig::getSiteId, SysConfig::getUpdateTime); wrapper.select(SysConfig::getCreateTime,SysConfig::getAddon,SysConfig::getStatus,SysConfig::getConfigKey, SysConfig::getValue, SysConfig::getSiteId, SysConfig::getUpdateTime);
wrapper.leftJoin(Site.class, "siteinfo",Site::getSiteId, SysConfig::getSiteId).select("site_name"); wrapper.leftJoin(Site.class, "siteinfo",Site::getSiteId, SysConfig::getSiteId).select("site_name");
wrapper.in(SysConfig::getConfigKey, ConfigKeyEnum.path.basename(WECHAT_AUTHORIZATION_INFO), ConfigKeyEnum.path.basename(WEAPP_AUTHORIZATION_INFO)); wrapper.in(SysConfig::getConfigKey, ConfigKeyEnum.basename(WECHAT_AUTHORIZATION_INFO), ConfigKeyEnum.basename(WEAPP_AUTHORIZATION_INFO));
wrapper.eq(SysConfig::getSiteId, this.requestContext.siteId); wrapper.eq(SysConfig::getSiteId, this.requestContext.siteId);
wrapper.orderByDesc(SysConfig::getUpdateTime); wrapper.orderByDesc(SysConfig::getUpdateTime);
any /* TODO: Page<SysConfig> */ pageObj = new Page<>(page, limit); any /* TODO: Page<SysConfig> */ pageObj = new Page<>(page, limit);

19
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/weapp-version-service-impl.service.ts
View File

@@ -2,12 +2,17 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import * as path from 'path'; import { @Lazy } from '../dtos/@-lazy.dto';
import { @LazyDto } from '../dtos/@-lazy.dto'; import { WxOplatfromWeappVersionVo } from '../../../../dtos/admin/wxoplatform/vo/wx-oplatfrom-weapp-version-vo.dto';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { WxOplatfromWeappVersionDto } from '../dtos/wx-oplatfrom-weapp-version.dto'; import { OplatformConfigVo } from '../../../../dtos/admin/wxoplatform/vo/oplatform-config-vo.dto';
import { UndoAuditParamDto } from '../dtos/undo-audit-param.dto'; import { WeappUploadParam } from '../../../../dtos/core/weapp/param/weapp-upload-param.dto';
import { SyncSiteGroupAuthWeappParamDto } from '../dtos/sync-site-group-auth-weapp-param.dto'; import { WxOplatfromWeappVersion } from '../dtos/wx-oplatfrom-weapp-version.dto';
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';
import { UndoAuditParam } from '../../../../dtos/admin/wxoplatform/param/undo-audit-param.dto';
import { SyncSiteGroupAuthWeappParam } from '../../../../dtos/admin/wxoplatform/param/sync-site-group-auth-weapp-param.dto';
@Injectable() @Injectable()
export class WeappVersionServiceImplService { export class WeappVersionServiceImplService {
@@ -343,7 +348,7 @@ export class WeappVersionServiceImplService {
const siteIds: number[] = this.siteRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("group_id", param.siteGroupId)).stream().map(Site::getSiteId); const siteIds: number[] = this.siteRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("group_id", param.siteGroupId)).stream().map(Site::getSiteId);
if (CommonUtils.isNotEmpty(siteIds)) { if (CommonUtils.isNotEmpty(siteIds)) {
const authSite: SysConfig[] = this.sysConfigRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("config_key", ConfigKeyEnum.path.basename(WEAPP_AUTHORIZATION_INFO))); const authSite: SysConfig[] = this.sysConfigRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("config_key", ConfigKeyEnum.basename(WEAPP_AUTHORIZATION_INFO)));
if (CommonUtils.isNotEmpty(authSite)) { if (CommonUtils.isNotEmpty(authSite)) {
authSite.forEach(item => { authSite.forEach(item => {
weappCommit(item.siteId, param.siteGroupId, version); weappCommit(item.siteId, param.siteGroupId, version);

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

@@ -2,7 +2,8 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result } from '@wwjBoot'; import { QueueService, EventBus, Result } from '@wwjBoot';
import { AgreementInfoParamDto } from '../dtos/agreement-info-param.dto'; import { AgreementInfoParam } from '../../../../dtos/api/agreement/param/agreement-info-param.dto';
import { AgreementInfoVo } from '../../../../dtos/api/agreement/vo/agreement-info-vo.dto';
@Injectable() @Injectable()
export class AgreementServiceImplService { export class AgreementServiceImplService {

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

@@ -2,9 +2,15 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { WechatAuthParamDto } from '../dtos/wechat-auth-param.dto'; import { WechatAuthParam } from '../../../../dtos/api/wechat/param/wechat-auth-param.dto';
import { GetNewVersionParamDto } from '../dtos/get-new-version-param.dto'; import { LoginVo } from '../../../../dtos/api/login/vo/login-vo.dto';
import { AuthRegisterParamDto } from '../dtos/auth-register-param.dto'; import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto';
import { GetNewVersionParam } from '../../../../dtos/api/channel/param/get-new-version-param.dto';
import { NewVersionVo } from '../../../../dtos/api/channel/vo/new-version-vo.dto';
import { AuthRegisterParam } from '../../../../dtos/api/wechat/param/auth-register-param.dto';
import { ApiAppConfigVo } from '../../../../dtos/api/channel/vo/api-app-config-vo.dto';
import { AppConfigVo } from '../../../../dtos/core/channel/vo/app-config-vo.dto';
import { WeappConfigVo } from '../../../../dtos/core/weapp/vo/weapp-config-vo.dto';
@Injectable() @Injectable()
export class AppServiceImplService { export class AppServiceImplService {

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

@@ -2,9 +2,15 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import { DiyFormWriteConfigDto } from '../dtos/diy-form-write-config.dto'; import { DiyFormInfoVo } from '../../../../dtos/api/diy/vo/diy-form-info-vo.dto';
import { DiyFormRecordsParamDto } from '../dtos/diy-form-records-param.dto'; import { DiyFormWriteConfig } from '../dtos/diy-form-write-config.dto';
import { List<DiyFormFields>Dto } from '../dtos/list<-diy-form-fields>.dto'; 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';
import { DiyFormRecordsDetailVo } from '../../../../dtos/api/diy/vo/diy-form-records-detail-vo.dto';
import { DiyFormRecordsFieldsListVo } from '../../../../dtos/core/diy_form/vo/diy-form-records-fields-list-vo.dto';
import { MemberConfigVo } from '../../../../dtos/admin/member/vo/member-config-vo.dto';
import { DiyMemberRecordVo } from '../../../../dtos/api/diy/vo/diy-member-record-vo.dto';
@Injectable() @Injectable()
export class DiyFormServiceImplService { export class DiyFormServiceImplService {
@@ -75,7 +81,7 @@ export class DiyFormServiceImplService {
} }
} }
} else { } else {
const errorMap: Record<String, String> = {}; const errorMap: Record<string, String> = {};
errorMap.put("title", "当前表单无法查看"); errorMap.put("title", "当前表单无法查看");
errorMap.put("type", "表单状态"); errorMap.put("type", "表单状态");
errorMap.put("desc", "该表单已关闭"); errorMap.put("desc", "该表单已关闭");
@@ -112,25 +118,25 @@ export class DiyFormServiceImplService {
if (writeConfig != null) { if (writeConfig != null) {
// 检查会员是否可以参与 // 检查会员是否可以参与
const canJoinError: Record<String, String> = checkMemberCanJoinOrNot(this.requestContext.memberId, writeConfig); const canJoinError: Record<string, String> = checkMemberCanJoinOrNot(this.requestContext.memberId, writeConfig);
if ((canJoinError && canJoinError.length > 0)) { if ((canJoinError && canJoinError.length > 0)) {
throw new ApiException(canJoinError.get("desc")); throw new ApiException(canJoinError.get("desc"));
} }
// 检查表单填写时间 // 检查表单填写时间
const timeError: Record<String, String> = checkFormWriteTime(writeConfig); const timeError: Record<string, String> = checkFormWriteTime(writeConfig);
if ((timeError && timeError.length > 0)) { if ((timeError && timeError.length > 0)) {
throw new ApiException(timeError.get("desc")); throw new ApiException(timeError.get("desc"));
} }
// 检查表单总填写次数限制 // 检查表单总填写次数限制
const formLimitError: Record<String, String> = checkFormWriteLimitNum(diyFormRecordsParam.formId, writeConfig); const formLimitError: Record<string, String> = checkFormWriteLimitNum(diyFormRecordsParam.formId, writeConfig);
if ((formLimitError && formLimitError.length > 0)) { if ((formLimitError && formLimitError.length > 0)) {
throw new ApiException(formLimitError.get("desc")); throw new ApiException(formLimitError.get("desc"));
} }
// 检查会员填写次数限制 // 检查会员填写次数限制
const memberLimitError: Record<String, String> = checkMemberWriteLimitNum(this.requestContext.memberId, diyFormRecordsParam.formId, writeConfig); const memberLimitError: Record<string, String> = checkMemberWriteLimitNum(this.requestContext.memberId, diyFormRecordsParam.formId, writeConfig);
if ((memberLimitError && memberLimitError.length > 0)) { if ((memberLimitError && memberLimitError.length > 0)) {
throw new ApiException(memberLimitError.get("desc")); throw new ApiException(memberLimitError.get("desc"));
} }
@@ -213,7 +219,7 @@ export class DiyFormServiceImplService {
} }
const result: DiyMemberRecordVo = setResult(diyFormFields); const result: DiyMemberRecordVo = setResult(diyFormFields);
const fieldMap: Record<String, DiyFormRecordsFields> = diyFormRecordsFields.collect(/* Collectors已删除 */.toMap(DiyFormRecordsFields::getFieldKey, field => field)); const fieldMap: Record<string, DiyFormRecordsFields> = diyFormRecordsFields.collect(/* Collectors已删除 */.toMap(DiyFormRecordsFields::getFieldKey, field => field));
for (const field of result.formField) { for (const field of result.formField) {
if (fieldMap.containsKey(field.fieldKey)) { if (fieldMap.containsKey(field.fieldKey)) {
field.fieldValue = fieldMap.get(field.getFieldKey().fieldValue == null ? "" : fieldMap.get(field.getFieldKey()).fieldValue); field.fieldValue = fieldMap.get(field.getFieldKey().fieldValue == null ? "" : fieldMap.get(field.getFieldKey()).fieldValue);
@@ -245,25 +251,25 @@ export class DiyFormServiceImplService {
if (writeConfig != null) { if (writeConfig != null) {
// 检查会员是否可以参与 // 检查会员是否可以参与
const canJoinError: Record<String, String> = checkMemberCanJoinOrNot(this.requestContext.memberId, writeConfig); const canJoinError: Record<string, String> = checkMemberCanJoinOrNot(this.requestContext.memberId, writeConfig);
if ((canJoinError && canJoinError.length > 0)) { if ((canJoinError && canJoinError.length > 0)) {
throw new ApiException(canJoinError.get("desc")); throw new ApiException(canJoinError.get("desc"));
} }
// 检查表单填写时间 // 检查表单填写时间
const timeError: Record<String, String> = checkFormWriteTime(writeConfig); const timeError: Record<string, String> = checkFormWriteTime(writeConfig);
if ((timeError && timeError.length > 0)) { if ((timeError && timeError.length > 0)) {
throw new ApiException(timeError.get("desc")); throw new ApiException(timeError.get("desc"));
} }
// 检查表单总填写次数限制 // 检查表单总填写次数限制
const formLimitError: Record<String, String> = checkFormWriteLimitNum(param.formId, writeConfig); const formLimitError: Record<string, String> = checkFormWriteLimitNum(param.formId, writeConfig);
if ((formLimitError && formLimitError.length > 0)) { if ((formLimitError && formLimitError.length > 0)) {
throw new ApiException(formLimitError.get("desc")); throw new ApiException(formLimitError.get("desc"));
} }
// 检查会员填写次数限制 // 检查会员填写次数限制
const memberLimitError: Record<String, String> = checkMemberWriteLimitNum(this.requestContext.memberId, param.formId, writeConfig); const memberLimitError: Record<string, String> = checkMemberWriteLimitNum(this.requestContext.memberId, param.formId, writeConfig);
if ((memberLimitError && memberLimitError.length > 0)) { if ((memberLimitError && memberLimitError.length > 0)) {
throw new ApiException(memberLimitError.get("desc")); throw new ApiException(memberLimitError.get("desc"));
} }

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

@@ -3,10 +3,16 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils } from '@wwjBoot';
import * as path from 'path'; import * as path from 'path';
import { DiyInfoParamDto } from '../dtos/diy-info-param.dto'; import { DiyInfoParam } from '../../../../dtos/api/diy/param/diy-info-param.dto';
import { DiyTabbarParamDto } from '../dtos/diy-tabbar-param.dto'; import { StartUpPageConfigVo } from '../../../../dtos/core/diy/vo/start-up-page-config-vo.dto';
import { DiyTabbarListParamDto } from '../dtos/diy-tabbar-list-param.dto'; import { TemplateParam } from '../../../../dtos/admin/diy/param/template-param.dto';
import { DiyShareParamDto } from '../dtos/diy-share-param.dto'; import { DiyInfoVo } from '../../../../dtos/api/diy/vo/diy-info-vo.dto';
import { DiyTabbarParam } from '../../../../dtos/api/diy/param/diy-tabbar-param.dto';
import { DiyTabbarVo } from '../../../../dtos/api/diy/vo/diy-tabbar-vo.dto';
import { DiyTabbarListParam } from '../../../../dtos/api/diy/param/diy-tabbar-list-param.dto';
import { BottomConfigVo } from '../../../../dtos/core/diy/vo/bottom-config-vo.dto';
import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto';
import { DiyShareParam } from '../../../../dtos/api/diy/param/diy-share-param.dto';
@Injectable() @Injectable()
export class DiyServiceImplService { export class DiyServiceImplService {

5
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/auth-service-impl.service.ts
View File

@@ -2,6 +2,11 @@ import { Injectable, UnauthorizedException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import { SiteInfoVo } from '../../../../dtos/core/site/vo/site-info-vo.dto';
import { MemberInfoParam } from '../../../../dtos/api/member/param/member-info-param.dto';
import { MemberInfoVo } from '../../../../dtos/api/member/vo/member-info-vo.dto';
import { H5ConfigVo } from '../../../../dtos/core/channel/vo/h5-config-vo.dto';
import { PcConfigVo } from '../../../../dtos/core/channel/vo/pc-config-vo.dto';
@Injectable() @Injectable()
export class AuthServiceImplService { export class AuthServiceImplService {

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

@@ -2,12 +2,17 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { @LazyDto } from '../dtos/@-lazy.dto'; import { @Lazy } from '../dtos/@-lazy.dto';
import { AccountLoginParamDto } from '../dtos/account-login-param.dto'; import { AccountLoginParam } from '../../../../dtos/api/login/param/account-login-param.dto';
import { MobileLoginParamDto } from '../dtos/mobile-login-param.dto'; import { MobileLoginParam } from '../../../../dtos/api/login/param/mobile-login-param.dto';
import { MemberDto } from '../dtos/member.dto'; import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto';
import { ResetPasswordParamDto } from '../dtos/reset-password-param.dto'; import { MobileRegisterParam } from '../../../../dtos/api/login/param/mobile-register-param.dto';
import { SendMobileCodeParamDto } from '../dtos/send-mobile-code-param.dto'; import { Member } from '../dtos/member.dto';
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';
import { MobileCodeCacheVo } from '../../../../dtos/api/login/vo/mobile-code-cache-vo.dto';
import { SendMobileCodeVo } from '../../../../dtos/api/login/vo/send-mobile-code-vo.dto';
@Injectable() @Injectable()
export class LoginServiceImplService { export class LoginServiceImplService {
@@ -127,7 +132,7 @@ export class LoginServiceImplService {
cache.code = String.format("%0" + 4 + "d", RandomUtil.randomInt(1, 9999)); cache.code = String.format("%0" + 4 + "d", RandomUtil.randomInt(1, 9999));
cache.type = param.type; cache.type = param.type;
const data: Record<String, Object> = {}; const data: Record<string, Object> = {};
data.put("mobile", param.mobile); data.put("mobile", param.mobile);
data.put("code", cache.code); data.put("code", cache.code);

8
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/register-service-impl.service.ts
View File

@@ -2,9 +2,11 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import { AccountRegisterParamDto } from '../dtos/account-register-param.dto'; import { LoginConfigVo } from '../../../../dtos/admin/member/vo/login-config-vo.dto';
import { MobileRegisterParamDto } from '../dtos/mobile-register-param.dto'; import { AccountRegisterParam } from '../../../../dtos/api/login/param/account-register-param.dto';
import { MemberDto } from '../dtos/member.dto'; import { MobileRegisterParam } from '../../../../dtos/api/login/param/mobile-register-param.dto';
import { Member } from '../dtos/member.dto';
import { MobileCodeCacheVo } from '../../../../dtos/api/login/vo/mobile-code-cache-vo.dto';
@Injectable() @Injectable()
export class RegisterServiceImplService { export class RegisterServiceImplService {

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

@@ -2,11 +2,12 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils } from '@wwjBoot';
import { GetAmountType(Dto } from '../dtos/get-amount-type(.dto'; import { GetAmountType( } from '../dtos/get-amount-type(.dto';
import { GetTradeType(Dto } from '../dtos/get-trade-type(.dto'; import { GetTradeType( } from '../dtos/get-trade-type(.dto';
import { AccountRecordsParamDto } from '../dtos/account-records-param.dto'; import { AccountRecordsParam } from '../../../../dtos/api/member/param/account-records-param.dto';
import { AccountAccountSourceParamDto } from '../dtos/account-account-source-param.dto'; import { AccountAccountSourceParam } from '../../../../dtos/api/member/param/account-account-source-param.dto';
import { AccountPointCountParamDto } from '../dtos/account-point-count-param.dto'; import { AccountPointCountParam } from '../../../../dtos/api/member/param/account-point-count-param.dto';
import { AccountPointCountVo } from '../../../../dtos/api/member/vo/account-point-count-vo.dto';
@Injectable() @Injectable()
export class MemberAccountServiceImplService { export class MemberAccountServiceImplService {

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

@@ -2,12 +2,14 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result } from '@wwjBoot'; import { QueueService, EventBus, Result } from '@wwjBoot';
import { MemberAddressAddParamDto } from '../dtos/member-address-add-param.dto'; import { MemberAddressAddParam } from '../../../../dtos/api/member/param/member-address-add-param.dto';
import { MemberAddressDto } from '../dtos/member-address.dto'; import { MemberAddress } from '../dtos/member-address.dto';
import { MemberAddressDeleteParamDto } from '../dtos/member-address-delete-param.dto'; import { MemberAddressDeleteParam } from '../../../../dtos/api/member/param/member-address-delete-param.dto';
import { MemberAddressEditParamDto } from '../dtos/member-address-edit-param.dto'; import { MemberAddressEditParam } from '../../../../dtos/api/member/param/member-address-edit-param.dto';
import { MemberAddressGetInfoParamDto } from '../dtos/member-address-get-info-param.dto'; import { MemberAddressGetInfoParam } from '../../../../dtos/api/member/param/member-address-get-info-param.dto';
import { MemberAddressGetListParamDto } from '../dtos/member-address-get-list-param.dto'; import { MemberAddressGetInfoVo } from '../../../../dtos/api/member/vo/member-address-get-info-vo.dto';
import { MemberAddressGetListParam } from '../../../../dtos/api/member/param/member-address-get-list-param.dto';
import { MemberAddressListInfoVo } from '../../../../dtos/api/member/vo/member-address-list-info-vo.dto';
@Injectable() @Injectable()
export class MemberAddressServiceImplService { export class MemberAddressServiceImplService {

30
wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-cash-out-service-impl.service.ts
View File

@@ -2,19 +2,23 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import { MemberCashOutInfoParamDto } from '../dtos/member-cash-out-info-param.dto'; import { MemberCashOutInfoParam } from '../../../../dtos/api/member/param/member-cash-out-info-param.dto';
import { MemberCashOutConfigParamDto } from '../dtos/member-cash-out-config-param.dto'; import { MemberCashOutInfoVo } from '../../../../dtos/api/member/vo/member-cash-out-info-vo.dto';
import { MemberCashOutTransferMethodParamDto } from '../dtos/member-cash-out-transfer-method-param.dto'; import { MemberCashOutConfigParam } from '../../../../dtos/api/member/param/member-cash-out-config-param.dto';
import { MemberCashOutApplyParamDto } from '../dtos/member-cash-out-apply-param.dto'; import { MemberCashOutTransferMethodParam } from '../../../../dtos/api/member/param/member-cash-out-transfer-method-param.dto';
import { MemberCashOutCancelParamDto } from '../dtos/member-cash-out-cancel-param.dto'; import { MemberCashOutApplyParam } from '../../../../dtos/core/member/param/member-cash-out-apply-param.dto';
import { CashOutTransferParamDto } from '../dtos/cash-out-transfer-param.dto'; import { MemberCashOutCancelParam } from '../../../../dtos/api/member/param/member-cash-out-cancel-param.dto';
import { PageParamDto } from '../dtos/page-param.dto'; import { CashOutTransferParam } from '../../../../dtos/admin/member/param/cash-out-transfer-param.dto';
import { MemberCashOutAccountListParamDto } from '../dtos/member-cash-out-account-list-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { MemberCashOutAccountDetailsParamDto } from '../dtos/member-cash-out-account-details-param.dto'; import { MemberCashOutAccountListParam } from '../../../../dtos/api/member/param/member-cash-out-account-list-param.dto';
import { MemberCashOutFirstAccountDetailsParamDto } from '../dtos/member-cash-out-first-account-details-param.dto'; import { MemberCashOutAccountVo } from '../../../../dtos/api/member/vo/member-cash-out-account-vo.dto';
import { MemberCashOutAccountAddParamDto } from '../dtos/member-cash-out-account-add-param.dto'; import { MemberCashOutAccountDetailsParam } from '../../../../dtos/api/member/param/member-cash-out-account-details-param.dto';
import { MemberCashOutAccountEditParamDto } from '../dtos/member-cash-out-account-edit-param.dto'; import { MemberCashOutAccountDetailsVo } from '../../../../dtos/api/member/vo/member-cash-out-account-details-vo.dto';
import { MemberCashOutAccountDeleteParamDto } from '../dtos/member-cash-out-account-delete-param.dto'; import { MemberCashOutFirstAccountDetailsParam } from '../../../../dtos/api/member/param/member-cash-out-first-account-details-param.dto';
import { MemberCashOutFirstAccountDetailsVo } from '../../../../dtos/api/member/vo/member-cash-out-first-account-details-vo.dto';
import { MemberCashOutAccountAddParam } from '../../../../dtos/api/member/param/member-cash-out-account-add-param.dto';
import { MemberCashOutAccountEditParam } from '../../../../dtos/api/member/param/member-cash-out-account-edit-param.dto';
import { MemberCashOutAccountDeleteParam } from '../../../../dtos/api/member/param/member-cash-out-account-delete-param.dto';
@Injectable() @Injectable()
export class MemberCashOutServiceImplService { export class MemberCashOutServiceImplService {

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

@@ -2,8 +2,10 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import { Set<Integer>Dto } from '../dtos/set<-integer>.dto'; import { MemberLevelSimpleInfoVo } from '../../../../dtos/api/member/vo/member-level-simple-info-vo.dto';
import { MemberLevelParamDto } from '../dtos/member-level-param.dto'; import { MemberLevelParam } from '../../../../dtos/api/member/param/member-level-param.dto';
import { MemberLevelInfoVo } from '../../../../dtos/api/member/vo/member-level-info-vo.dto';
import { MemberGetMobileVo } from '../../../../dtos/api/member/vo/member-get-mobile-vo.dto';
@Injectable() @Injectable()
export class MemberLevelServiceImplService { export class MemberLevelServiceImplService {

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

@@ -2,13 +2,16 @@ import { Injectable, BadRequestException } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, StringUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, StringUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import { MemberInfoParamDto } from '../dtos/member-info-param.dto'; import { MemberInfoParam } from '../../../../dtos/api/member/param/member-info-param.dto';
import { MemberCenterParamDto } from '../dtos/member-center-param.dto'; import { MemberInfoVo } from '../../../../dtos/api/member/vo/member-info-vo.dto';
import { MemberModifyParamDto } from '../dtos/member-modify-param.dto'; import { MemberConfigVo } from '../../../../dtos/admin/member/vo/member-config-vo.dto';
import { MemberEditParamDto } from '../dtos/member-edit-param.dto'; import { MemberCenterParam } from '../../../../dtos/api/member/param/member-center-param.dto';
import { MemberMobileParamDto } from '../dtos/member-mobile-param.dto'; import { MemberCenterVo } from '../../../../dtos/api/member/vo/member-center-vo.dto';
import { MemberLogParamDto } from '../dtos/member-log-param.dto'; import { MemberModifyParam } from '../../../../dtos/api/member/param/member-modify-param.dto';
import { MemberQcodeParamDto } from '../dtos/member-qcode-param.dto'; import { MemberEditParam } from '../../../../dtos/api/member/param/member-edit-param.dto';
import { MemberMobileParam } from '../../../../dtos/api/member/param/member-mobile-param.dto';
import { MemberLogParam } from '../../../../dtos/api/member/param/member-log-param.dto';
import { MemberQcodeParam } from '../../../../dtos/api/member/param/member-qcode-param.dto';
@Injectable() @Injectable()
export class MemberServiceImplService { export class MemberServiceImplService {

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

@@ -2,13 +2,18 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import { PageParamDto } from '../dtos/page-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { MemberSignRecordParamDto } from '../dtos/member-sign-record-param.dto'; import { MemberSignRecordParam } from '../../../../dtos/api/member/param/member-sign-record-param.dto';
import { MemberSignDetailsParamDto } from '../dtos/member-sign-details-param.dto'; import { MemberSignRecordVo } from '../../../../dtos/api/member/vo/member-sign-record-vo.dto';
import { MemberSignOperateParamDto } from '../dtos/member-sign-operate-param.dto'; import { MemberSignDetailsParam } from '../../../../dtos/api/member/param/member-sign-details-param.dto';
import { MemberSignMonthRecordParamDto } from '../dtos/member-sign-month-record-param.dto'; import { MemberSignDetailsVo } from '../../../../dtos/api/member/vo/member-sign-details-vo.dto';
import { MemberSignDayRecordParamDto } from '../dtos/member-sign-day-record-param.dto'; import { MemberSignOperateParam } from '../../../../dtos/api/member/param/member-sign-operate-param.dto';
import { MemberSignConfigParamDto } from '../dtos/member-sign-config-param.dto'; import { MemberSignConfigVo } from '../../../../dtos/api/member/vo/member-sign-config-vo.dto';
import { MemberSignOperateVo } from '../../../../dtos/api/member/vo/member-sign-operate-vo.dto';
import { MemberSignMonthRecordParam } from '../../../../dtos/api/member/param/member-sign-month-record-param.dto';
import { MemberSignMonthRecordVo } from '../../../../dtos/api/member/vo/member-sign-month-record-vo.dto';
import { MemberSignDayRecordParam } from '../../../../dtos/api/member/param/member-sign-day-record-param.dto';
import { MemberSignConfigParam } from '../../../../dtos/api/member/param/member-sign-config-param.dto';
@Injectable() @Injectable()
export class MemberSignServiceImplService { export class MemberSignServiceImplService {
@@ -104,7 +109,7 @@ export class MemberSignServiceImplService {
this.memberSignRepository.save(model); this.memberSignRepository.save(model);
// 发放日签奖励 // 发放日签奖励
const dayAwardVar: Record<String, Object> = {}; const dayAwardVar: Record<string, Object> = {};
dayAwardVar.put("from_type", "day_sign_award"); dayAwardVar.put("from_type", "day_sign_award");
dayAwardVar.put("memo", "日签奖励"); dayAwardVar.put("memo", "日签奖励");
this.coreMemberService.memberGiftGrant(param.siteId(), param.memberId(), config.dayAward, dayAwardVar); this.coreMemberService.memberGiftGrant(param.siteId(), param.memberId(), config.dayAward, dayAwardVar);
@@ -152,7 +157,7 @@ export class MemberSignServiceImplService {
continueAward.remove("receive_limit"); continueAward.remove("receive_limit");
continueAward.remove("receive_num"); continueAward.remove("receive_num");
const continueAwardVar: Record<String, Object> = {}; const continueAwardVar: Record<string, Object> = {};
continueAwardVar.put("from_type", "continue_sign_award"); continueAwardVar.put("from_type", "continue_sign_award");
continueAwardVar.put("memo", "连签奖励"); continueAwardVar.put("memo", "连签奖励");
this.coreMemberService.memberGiftGrant(param.siteId(), param.memberId(), continueAward, continueAwardVar); this.coreMemberService.memberGiftGrant(param.siteId(), param.memberId(), continueAward, continueAwardVar);

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

@@ -2,10 +2,12 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, CommonUtils, RequestContextService } from '@wwjBoot';
import { PayParamDto } from '../dtos/pay-param.dto'; import { PayParam } from '../../../../dtos/admin/pay/param/pay-param.dto';
import { PayAsyncNotifyParamDto } from '../dtos/pay-async-notify-param.dto'; import { PayAsyncNotifyParam } from '../../../../dtos/common/loader/pay/param/pay-async-notify-param.dto';
import { HttpServletRequestDto } from '../dtos/http-servlet-request.dto'; import { HttpServletRequest } from '../dtos/http-servlet-request.dto';
import { HttpServletResponseDto } from '../dtos/http-servlet-response.dto'; import { HttpServletResponse } from '../dtos/http-servlet-response.dto';
import { GetInfoByTradeVo } from '../../../../dtos/core/pay/vo/get-info-by-trade-vo.dto';
import { FriendspayInfoVo } from '../../../../dtos/api/pay/vo/friendspay-info-vo.dto';
@Injectable() @Injectable()
export class PayServiceImplService { export class PayServiceImplService {

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

@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, RequestContextService } from '@wwjBoot';
import { Base64ImageVo } from '../../../../dtos/api/sys/vo/base64-image-vo.dto';
@Injectable() @Injectable()
export class Base64ServiceImplService { export class Base64ServiceImplService {

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

@@ -2,12 +2,13 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result } from '@wwjBoot'; import { QueueService, EventBus, Result } from '@wwjBoot';
import { List<SysAreaLevelVo>Dto } from '../dtos/list<-sys-area-level-vo>.dto'; import { SysAreaListVo } from '../../../../dtos/api/sys/vo/sys-area-list-vo.dto';
import { Map<IntegerDto } from '../dtos/map<-integer.dto'; import { SysAreaLevelVo } from '../../../../dtos/api/sys/vo/sys-area-level-vo.dto';
import { List<SysAreaLevelVo>>Dto } from '../dtos/list<-sys-area-level-vo>>.dto'; import { Map<Integer } from '../dtos/map<-integer.dto';
import { SysAreaLevelVoDto } from '../dtos/sys-area-level-vo.dto'; import { List> } from '../dtos/list>.dto';
import { SysAreaDto } from '../dtos/sys-area.dto'; import { SysArea } from '../dtos/sys-area.dto';
import { SysAreaAddressByLatlngParamDto } from '../dtos/sys-area-address-by-latlng-param.dto'; 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';
@Injectable() @Injectable()
export class SysAreaServiceImplService { export class SysAreaServiceImplService {

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

@@ -2,10 +2,10 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result } from '@wwjBoot'; import { QueueService, EventBus, Result } from '@wwjBoot';
import { SysConfigCopyrightParamDto } from '../dtos/sys-config-copyright-param.dto'; import { SysConfigCopyrightParam } from '../../../../dtos/api/sys/param/sys-config-copyright-param.dto';
import { SysConfigSiteParamDto } from '../dtos/sys-config-site-param.dto'; import { SysConfigSiteParam } from '../../../../dtos/api/sys/param/sys-config-site-param.dto';
import { SysConfigSceneDomainParamDto } from '../dtos/sys-config-scene-domain-param.dto'; import { SysConfigSceneDomainParam } from '../dtos/sys-config-scene-domain-param.dto';
import { SysConfigMapParamDto } from '../dtos/sys-config-map-param.dto'; import { SysConfigMapParam } from '../../../../dtos/api/sys/param/sys-config-map-param.dto';
@Injectable() @Injectable()
export class SysConfigServiceImplService { export class SysConfigServiceImplService {

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

@@ -3,15 +3,19 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot'; import { QueueService, EventBus, Result, JsonUtils, AppConfigService, CommonUtils, RequestContextService } from '@wwjBoot';
import * as fs from 'fs'; import * as fs from 'fs';
import { SysVerifyGetCodeParamDto } from '../dtos/sys-verify-get-code-param.dto'; import { SysVerifyGetCodeParam } from '../../../../dtos/api/sys/param/sys-verify-get-code-param.dto';
import { Map<StringDto } from '../dtos/map<-string.dto'; import { SysVerifyGetCodeVo } from '../../../../dtos/api/sys/vo/sys-verify-get-code-vo.dto';
import { Object>Dto } from '../dtos/object>.dto'; import { Map<String } from '../dtos/map<-string.dto';
import { SysVerifyCheckVerifierParamDto } from '../dtos/sys-verify-check-verifier-param.dto'; import { Object> } from '../dtos/object>.dto';
import { PageParamDto } from '../dtos/page-param.dto'; import { SysVerifyCheckVerifierParam } from '../../../../dtos/api/sys/param/sys-verify-check-verifier-param.dto';
import { SysVerifyRecordsParamDto } from '../dtos/sys-verify-records-param.dto'; import { PageParam } from '../../../../dtos/page-param.dto';
import { SysVerifyDetailParamDto } from '../dtos/sys-verify-detail-param.dto'; import { SysVerifyRecordsParam } from '../../../../dtos/api/sys/param/sys-verify-records-param.dto';
import { SysVerifyByCodeParamDto } from '../dtos/sys-verify-by-code-param.dto'; import { SysVerifyRecordsVo } from '../../../../dtos/api/sys/vo/sys-verify-records-vo.dto';
import { SysVerifyCodeParamDto } from '../dtos/sys-verify-code-param.dto'; import { MemberBriefInfoVo } from '../../../../dtos/admin/member/vo/member-brief-info-vo.dto';
import { SysVerifyDetailParam } from '../../../../dtos/api/sys/param/sys-verify-detail-param.dto';
import { SysVerifyDetailVo } from '../../../../dtos/api/sys/vo/sys-verify-detail-vo.dto';
import { SysVerifyByCodeParam } from '../../../../dtos/api/sys/param/sys-verify-by-code-param.dto';
import { SysVerifyCodeParam } from '../../../../dtos/api/sys/param/sys-verify-code-param.dto';
@Injectable() @Injectable()
export class SysVerifyServiceImplService { export class SysVerifyServiceImplService {
@@ -183,7 +187,7 @@ export class SysVerifyServiceImplService {
*/ */
async verifyCode(param: SysVerifyCodeParam): Promise<any> { async verifyCode(param: SysVerifyCodeParam): Promise<any> {
// 1、获取核销码数据 // 1、获取核销码数据
const verifyMap: Record<String, Object> = this.getCodeData(param.code); const verifyMap: Record<string, Object> = this.getCodeData(param.code);
// 检测站点数据 // 检测站点数据
if (verifyMap.get("site_id") == null || !verifyMap.get("site_id").equals(param.siteId())) { if (verifyMap.get("site_id") == null || !verifyMap.get("site_id").equals(param.siteId())) {
// 核销码已过期 // 核销码已过期
@@ -198,7 +202,7 @@ export class SysVerifyServiceImplService {
throw new Error("核销员不存在"); throw new Error("核销员不存在");
} }
// 核销操作 // 核销操作
const verifyDataMap: Record<String, Object> = {}; const verifyDataMap: Record<string, Object> = {};
verifyDataMap.put("site_id", verifyMap.get("site_id")); verifyDataMap.put("site_id", verifyMap.get("site_id"));
verifyDataMap.put("code", param.code); verifyDataMap.put("code", param.code);
verifyDataMap.put("body", verifyMap.get("body")); verifyDataMap.put("body", verifyMap.get("body"));

Some files were not shown because too many files have changed in this diff Show More