diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/service-generator.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/service-generator.js index f76feeff..07f124e4 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/service-generator.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/generators/service-generator.js @@ -166,6 +166,8 @@ ${methods} /** * 分析方法体，识别需要的额外imports + * + * ✅ 调用 ServiceMethodConverter.analyzeImports 获取完整的import列表 */ analyzeAdditionalImports(methodsCode) { const imports = { @@ -174,6 +176,33 @@ ${methods} boot: new Set() }; + // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ + // 【调用转换器的analyzeImports，获取V1框架能力的imports】 + // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ + const converterImports = this.methodConverter.analyzeImports(methodsCode); + + converterImports.forEach(importItem => { + if (importItem === 'JsonUtils' || importItem === 'CommonUtils' || importItem === 'StringUtils') { + imports.boot.add(importItem); + } else if (importItem === 'AppConfigService') { + imports.boot.add('AppConfigService'); + } else if (importItem === 'nestjs:BadRequestException') { + imports.nestjs.add('BadRequestException'); + } else if (importItem === 'nestjs:UnauthorizedException') { + imports.nestjs.add('UnauthorizedException'); + } else if (importItem === 'node:fs') { + imports.nodeModules.add('fs'); + } else if (importItem === 'node:path') { + imports.nodeModules.add('path'); + } else if (importItem === 'boot:RequestContextService') { + imports.boot.add('RequestContextService'); + } + }); + + // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ + // 【兼容旧的检测逻辑（备用）】 + // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ + // NestJS异常 if (methodsCode.includes('BadRequestException')) { imports.nestjs.add('BadRequestException'); @@ -190,9 +219,21 @@ ${methods} imports.nodeModules.add('path'); } - // ConfigService - if (methodsCode.includes('this.config.')) { - imports.boot.add('ConfigService'); + // Boot层工具类 + if (methodsCode.includes('JsonUtils.')) { + imports.boot.add('JsonUtils'); + } + if (methodsCode.includes('CommonUtils.')) { + imports.boot.add('CommonUtils'); + } + if (methodsCode.includes('StringUtils.')) { + imports.boot.add('StringUtils'); + } + if (methodsCode.includes('this.appConfig.')) { + imports.boot.add('AppConfigService'); + } + if (methodsCode.includes('this.requestContext.')) { + imports.boot.add('RequestContextService'); } return { @@ -230,7 +271,10 @@ ${methods} imports.push("import { Repository } from 'typeorm';"); // ✅ Boot层（按需导入） + // 基础服务（总是导入） const bootImports = ['QueueService', 'EventBus', 'Result']; + + // 添加额外的Boot层imports（工具类、服务等） if (additionalImports.boot && additionalImports.boot.length > 0) { additionalImports.boot.forEach(item => { if (!bootImports.includes(item)) { @@ -238,7 +282,11 @@ ${methods} } }); } - imports.push(`import { ${bootImports.join(', ')} } from '@wwjBoot';`); + + // 生成import语句 + if (bootImports.length > 0) { + imports.push(`import { ${bootImports.join(', ')} } from '@wwjBoot';`); + } // ✅ Node.js模块（按需导入） if (additionalImports.nodeModules && additionalImports.nodeModules.length > 0) { @@ -317,12 +365,18 @@ ${methods} generateConstructor(javaService, additionalImports = {}) { const injections = []; - // ✅ 添加ConfigService注入（如果需要） + // ✅ 添加Boot层服务注入（按需） + if (additionalImports.boot && additionalImports.boot.includes('AppConfigService')) { + injections.push(' private readonly appConfig: AppConfigService,'); + } + if (additionalImports.boot && additionalImports.boot.includes('RequestContextService')) { + injections.push(' private readonly requestContext: RequestContextService,'); + } if (additionalImports.boot && additionalImports.boot.includes('ConfigService')) { injections.push(' private readonly config: ConfigService,'); } - // 添加框架服务注入 + // 添加框架服务注入（总是注入） injections.push(' private readonly eventBus: EventBus,'); injections.push(' private readonly queueService: QueueService,'); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts index 8af1e129..ce6ebcbb 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts @@ -15,7 +15,7 @@ export class AddonDevelopServiceImplService { * list */ async list(...args: any[]): Promise { - const list: AddonDevelopListVo[] = new LinkedList(); + const list: AddonDevelopListVo[] = []; try { // 获取已安装的插件 diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-log-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-log-service-impl.service.ts index 49b62139..3303b96a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-log-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-log-service-impl.service.ts @@ -21,7 +21,7 @@ export class AddonLogServiceImplService { [AddonLog[], number] iPage = this.addonLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: AddonLogListVo[] = new LinkedList(); + const list: AddonLogListVo[] = []; for (const item of iPageRecords) { const vo: AddonLogListVo = new AddonLogListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-service-impl.service.ts index 2c60480a..fbd05d9a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-service-impl.service.ts @@ -90,7 +90,7 @@ export class AddonServiceImplService { any /* TODO: QueryWrapper */ queryWrapper = new QueryWrapper(); queryWrapper.orderByDesc("id"); [Addon[], number] iPage = this.addonRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: AddonListVo[] = new LinkedList(); + const list: AddonListVo[] = []; for (const item of iPageRecords) { const vo: AddonListVo = new AddonListVo(); Object.assign(vo, item); @@ -225,7 +225,7 @@ export class AddonServiceImplService { actionQuery.put("data[product_key]", instance.getProductKey()); const actionToken: Record = this.niucloudService.getActionToken("download", actionQuery); - Record = new HashMap(); + Record = {}; query.put("authorize_code", instance.getCode()); query.put("addon_name", addon); query.put("version", version); @@ -256,7 +256,7 @@ export class AddonServiceImplService { * getIndexAddonList */ async getIndexAddonList(...args: any[]): Promise { - const params: Record = new HashMap(); + const params: Record = {}; const config: NiucloudConfigVo = this.coreNiucloudConfigService.getNiucloudConfig(); params.put("code", config.getAuthCode()); params.put("secret", config.getAuthSecret()); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/auth-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/auth-service-impl.service.ts index 403a76f2..d3841c9f 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/auth-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/auth-service-impl.service.ts @@ -109,9 +109,9 @@ export class AuthServiceImplService { const siteId: number = this.requestContext.siteId; const uid: number = RequestUtils.uid(); const appType: string = RequestUtils.appType(); - Map authApi = new HashMap(); + Map authApi = {}; const sysUserRoleInfoVo: SysUserRoleInfoVo = new SysUserRoleInfoVo(); - const menuList: SysMenu[] = new ArrayList(); + const menuList: SysMenu[] = []; if (isSuperAdmin()) { isAdmin = 1; } else { @@ -122,7 +122,7 @@ export class AuthServiceImplService { isAdmin = sysUserRoleInfoVo.getIsAdmin();//是否是超级管理员 } if (isAdmin > 0) { - menuList = this.sysMenuService.getMenuListByCondition(appType, siteId, 1, 0, new ArrayList(), addon); + menuList = this.sysMenuService.getMenuListByCondition(appType, siteId, 1, 0, [], addon); } else { const roleIdList: string[] = JSONUtil.toList(JSONUtil.parseArray(sysUserRoleInfoVo.getRoleIds()), String.class); const menuKeyList: string[] = this.sysRoleService.getMenuIdsByRoleIds(siteId, roleIdList); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/login-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/login-service-impl.service.ts index 4fd3e0e2..aa79f91c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/login-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/login-service-impl.service.ts @@ -51,7 +51,7 @@ export class LoginServiceImplService { const defaultSiteId: number = 0; const roleInfoVo: SysUserRoleInfoVo = new SysUserRoleInfoVo(); - const siteIds: number[] = new ArrayList(); + const siteIds: number[] = []; if(appType === AppTypeEnum.path.basename(ADMIN)){ defaultSiteId=RequestUtils.defaultSiteId(); roleInfoVo=this.sysUserRoleService.getUserRole(defaultSiteId, userInfo.getUid()); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/channel/impl/admin-app-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/channel/impl/admin-app-service-impl.service.ts index a47b904f..d856b67c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/channel/impl/admin-app-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/channel/impl/admin-app-service-impl.service.ts @@ -39,7 +39,7 @@ export class AdminAppServiceImplService { any /* TODO: Page */ resultPage = this.appVersionRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }); - const list: AppVersionListVo[] = new LinkedList(); + const list: AppVersionListVo[] = []; for (const item of resultPageRecords) { const vo: AppVersionListVo = new AppVersionListVo(); BeanUtil.copyProperties(item, vo); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/dict/impl/dict-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/dict/impl/dict-service-impl.service.ts index ef65f73a..4c7d226c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/dict/impl/dict-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/dict/impl/dict-service-impl.service.ts @@ -30,7 +30,7 @@ export class DictServiceImplService { queryWrapper.orderByDesc("id"); [SysDict[], number] iPage = this.dictRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: DictListVo[] = new LinkedList(); + const list: DictListVo[] = []; for (const item of iPageRecords) { const vo: DictListVo = new DictListVo(); Object.assign(vo, item); @@ -106,7 +106,7 @@ export class DictServiceImplService { queryWrapper.orderByDesc("id"); const voList: SysDict[] = this.dictRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - const list: DictListVo[] = new LinkedList(); + const list: DictListVo[] = []; for (const item of voList) { const vo: DictListVo = new DictListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-route-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-route-service-impl.service.ts index e7d2dc53..c2024fb9 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-route-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-route-service-impl.service.ts @@ -15,7 +15,7 @@ export class DiyRouteServiceImplService { */ async list(...args: any[]): Promise { const linkEnum: Record = LinkEnum.getLink(); - const routerList: DiyRouteListVo[] = new LinkedList(); + const routerList: DiyRouteListVo[] = []; const sort: number = 0; for (const key of linkEnum.keySet()) { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-service-impl.service.ts index 2ad074f1..92dd5cf0 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-service-impl.service.ts @@ -28,7 +28,7 @@ export class DiyServiceImplService { const template: Record = TemplateEnum.getTemplate(); List> templateAddon = TemplateEnum.getTemplateAddons((this.requestContext.siteId)); [DiyPage[], number] iPage = this.diyPageRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: DiyPageListVo[] = new LinkedList(); + const list: DiyPageListVo[] = []; for (const item of iPageRecords) { const vo: DiyPageListVo = new DiyPageListVo(); Object.assign(vo, item); @@ -61,7 +61,7 @@ export class DiyServiceImplService { } const pages: DiyPage[] = this.diyPageRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - const list: DiyPageListVo[] = new LinkedList(); + const list: DiyPageListVo[] = []; for (const item of pages) { const vo: DiyPageListVo = new DiyPageListVo(); @@ -332,7 +332,7 @@ export class DiyServiceImplService { // 安全遍历顶层数据 Iterator categoryIterator = data.keySet().iterator(); - const categoryToRemove: string[] = new ArrayList(); + const categoryToRemove: string[] = []; while (categoryIterator.hasNext()) { const categoryKey: string = categoryIterator.next(); @@ -343,7 +343,7 @@ export class DiyServiceImplService { const sortMap: Record = new Record(); // 安全遍历组件列表 - const keysToRemove: string[] = new ArrayList(); + const keysToRemove: string[] = []; for (const componentKey of new ArrayList<>(componentList.keySet())) { const component: Record = componentList.getRecord(componentKey); const supportPage: JSONArray = component.getJSONArray("support_page"); @@ -499,7 +499,7 @@ export class DiyServiceImplService { .orderByDesc("id"); [DiyPage[], number] iPage = this.diyPageRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: DiyPageListVo[] = new LinkedList(); + const list: DiyPageListVo[] = []; for (const item of iPageRecords) { const vo: DiyPageListVo = new DiyPageListVo(); Object.assign(vo, item); @@ -661,7 +661,7 @@ export class DiyServiceImplService { const templates: Record = TemplateEnum.getTemplate(new TemplateParam()); [DiyPage[], number] iPage = this.diyPageRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: DiyPageListVo[] = new LinkedList(); + const list: DiyPageListVo[] = []; for (const item of iPageRecords) { const vo: DiyPageListVo = new DiyPageListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-theme-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-theme-service-impl.service.ts index e702f606..f63734d4 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-theme-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-theme-service-impl.service.ts @@ -16,7 +16,7 @@ export class DiyThemeServiceImplService { const siteId: number = this.requestContext.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 themeData: Record = new HashMap(); + const themeData: Record = {}; if ((themeDataList && themeDataList.length > 0)){ themeData = themeDataList.collect(/* Collectors已删除 */.toMap(theme => theme.getAddon(), theme => theme)); } @@ -93,7 +93,7 @@ export class DiyThemeServiceImplService { throw new BadRequestException("主题色不存在"); } const addonData: Addon[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); - const addonSaveData: DiyTheme[] = new ArrayList(); + const addonSaveData: DiyTheme[] = []; if(CommonUtils.isNotEmpty(addonData)){ for (const addon of addonData) { const saveData: DiyTheme = new DiyTheme(); @@ -132,7 +132,7 @@ export class DiyThemeServiceImplService { async getDefaultThemeColor(...args: any[]): Promise { const addon: string = data.getAddon(); const themeList: DiyTheme[] = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("addon", addon)); - const voList: DiyThemeInfoVo[] = new ArrayList(); + const voList: DiyThemeInfoVo[] = []; for (const theme of themeList) { const vo: DiyThemeInfoVo = new DiyThemeInfoVo(); Object.assign(vo, theme); @@ -152,7 +152,7 @@ export class DiyThemeServiceImplService { async addDiyTheme(...args: any[]): Promise { const siteId: number = this.requestContext.siteId; const addonData: Addon[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); - const addonSaveData: DiyTheme[] = new ArrayList(); + const addonSaveData: DiyTheme[] = []; if ((addonData && addonData.length > 0)) { for (const addon of addonData) { @@ -192,7 +192,7 @@ export class DiyThemeServiceImplService { throw new Error("主题色不存在"); } const addonData: DiyTheme[] = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("title", diyThemeInfo.title)); - const addonSaveData: DiyTheme[] = new ArrayList(); + const addonSaveData: DiyTheme[] = []; if (CommonUtils.isNotEmpty(addonData)) { for (const diyTheme of addonData) { const saveData: DiyTheme = new DiyTheme(); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-records-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-records-service-impl.service.ts index b101f94b..f5660573 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-records-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-records-service-impl.service.ts @@ -156,7 +156,7 @@ export class DiyFormRecordsServiceImplService { } } totalCount = 0; - Map> valueMap = new HashMap(); + Map> valueMap = {}; for (Record record : fieldList) { if (!"FormCheckbox".equals(record.get("field_type"))) { const key: string = record.get("field_key") + "_" + record.get("render_value"); @@ -205,7 +205,7 @@ export class DiyFormRecordsServiceImplService { } // 合并结果 - const resultList: DiyFormFieldsListVo[] = new ArrayList(); + const resultList: DiyFormFieldsListVo[] = []; resultList.addAll(simpleFieldList); resultList.addAll(jsonFieldList); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-service-impl.service.ts index 9c33c5a8..88d7f6bf 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-service-impl.service.ts @@ -39,7 +39,7 @@ export class DiyFormServiceImplService { queryWrapper.orderByDesc("form_id"); [DiyForm[], number] iPage = this.diyFormRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: DiyFormListVo[] = new LinkedList(); + const list: DiyFormListVo[] = []; for (const item of iPageRecords) { const vo: DiyFormListVo = new DiyFormListVo(); Object.assign(vo, item); @@ -76,7 +76,7 @@ export class DiyFormServiceImplService { } queryWrapper.orderByDesc("form_id"); const list: DiyForm[] = this.diyFormRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - const voList: DiyFormListVo[] = new LinkedList(); + const voList: DiyFormListVo[] = []; for (const item of list) { const vo: DiyFormListVo = new DiyFormListVo(); Object.assign(vo, item); @@ -145,7 +145,7 @@ export class DiyFormServiceImplService { model.createTime = Date.now( / 1000); model.updateTime = Date.now( / 1000); this.diyFormRepository.save(model); - const diyFormFields: DiyFormFields[] = new ArrayList(); + const diyFormFields: DiyFormFields[] = []; if (CommonUtils.isNotEmpty(addParam.value)) { const value: Record = JsonUtils.parseObject(addParam.value); const components: JSONArray = value.getJSONArray("value"); @@ -221,8 +221,8 @@ export class DiyFormServiceImplService { diyFormMapper.updateById(model); const formFieldsList: DiyFormFields[] = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); const formFieldsListMap: Record = formFieldsList.collect(/* Collectors已删除 */.toMap(DiyFormFields::getFieldKey, a => a)); - const existFieldKeys: string[] = new ArrayList(); - const diyFormFields: DiyFormFields[] = new ArrayList(); + const existFieldKeys: string[] = []; + const diyFormFields: DiyFormFields[] = []; if (CommonUtils.isNotEmpty(editParam.value)) { const value: Record = JsonUtils.parseObject(editParam.value); const components: JSONArray = value.getJSONArray("value"); @@ -441,7 +441,7 @@ export class DiyFormServiceImplService { // 复制表单字段 if (!CommonUtils.isEmpty(diyFormFields)) { - const newFormFieldList: DiyFormFields[] = new ArrayList(); + const newFormFieldList: DiyFormFields[] = []; for (const item of diyFormFields) { const newField: DiyFormFields = new DiyFormFields(); Object.assign(newField, item); @@ -566,7 +566,7 @@ export class DiyFormServiceImplService { queryWrapper.orderByDesc(diyFormRecordsFieldsSearchParam.getOrder()); } const list: DiyFormFields[] = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - const listVo: DiyFormFieldsListVo[] = new LinkedList(); + const listVo: DiyFormFieldsListVo[] = []; for (const item of list) { const vo: DiyFormFieldsListVo = new DiyFormFieldsListVo(); Object.assign(vo, item); @@ -582,7 +582,7 @@ export class DiyFormServiceImplService { const page: number = pageParam.page; const limit: number = pageParam.limit; // 验证表单ID集合 - const verifyFormIds: number[] = new ArrayList(); + const verifyFormIds: number[] = []; if (param.getVerifyFormIds() != null && !param.getVerifyFormIds().isEmpty()) { // 查询存在的表单ID const existForms: DiyForm[] = this.diyFormRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) @@ -615,9 +615,9 @@ export class DiyFormServiceImplService { [DiyForm[], number] formPage = this.diyFormRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); if (formPageTotal == 0){ - return PageResult.build(page, limit, 0, new ArrayList()); + return PageResult.build(page, limit, 0, []); } - const resultList: DiyFormInfoVo[] = new ArrayList(); + const resultList: DiyFormInfoVo[] = []; formPageRecords.forEach(item => { const diyFormInfoVo: DiyFormInfoVo = new DiyFormInfoVo(); Object.assign(diyFormInfoVo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-service-impl.service.ts index 2fd128c4..86d6d0b1 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-service-impl.service.ts @@ -69,7 +69,7 @@ export class GenerateServiceImplService { } const columnList: GenerateColumn[] = this.generateColumnRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); if (CommonUtils.isNotEmpty(columnList)) { - const columnVoList: GenerateColumnVo[] = new ArrayList(); + const columnVoList: GenerateColumnVo[] = []; for (const column of columnList) { const generateColumnVo: GenerateColumnVo = new GenerateColumnVo(); Object.assign(generateColumnVo, column); @@ -163,7 +163,7 @@ export class GenerateServiceImplService { //添加生成字段数据 List> columns = jdbcTemplate.queryForList("SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = (SELECT DATABASE()) and TABLE_NAME='" + tablePrefix + tableName + "'"); const id: number = generateTable.id; - const list: GenerateColumn[] = new ArrayList(); + const list: GenerateColumn[] = []; for (Record column : columns) { const generateColumn: GenerateColumn = new GenerateColumn(); @@ -221,7 +221,7 @@ export class GenerateServiceImplService { //更新表字段 this.generateColumnRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ })); const columns: JSONArray = JSONUtil.parseArray(generateParam.getTableColumn()); - const list: GenerateColumn[] = new ArrayList(); + const list: GenerateColumn[] = []; for (const i of number = 0; i < columns.length; i++) { const generateColumn: GenerateColumn = new GenerateColumn(); @@ -346,7 +346,7 @@ export class GenerateServiceImplService { const list: GenerateColumn[] = this.generateColumnRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); const coreGenerateService: CoreGenerateService = new CoreGenerateService(); const columnList: CoreGenerateTemplateVo[] = this.coreGenerateService.generateCode(generateTable, list); - const voList: GeneratePreviewVo[] = new ArrayList(); + const voList: GeneratePreviewVo[] = []; for (const coreGenerateTemplateVo of columnList) { const vo: GeneratePreviewVo = new GeneratePreviewVo(); vo.name = coreGenerateTemplateVo.getFileName(); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/home/impl/auth-site-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/home/impl/auth-site-service-impl.service.ts index 9f730702..9eb18d72 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/home/impl/auth-site-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/home/impl/auth-site-service-impl.service.ts @@ -44,7 +44,7 @@ export class AuthSiteServiceImplService { if (CommonUtils.isNotEmpty(siteIds)) { queryWrapper.in("site_id", siteIds); } else { - return PageResult.build(page, limit, 0).setData(new ArrayList()); + return PageResult.build(page, limit, 0).setData([]); } } @@ -91,7 +91,7 @@ export class AuthSiteServiceImplService { } [Site[], number] iPage = this.siteRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: SiteListVo[] = new LinkedList(); + const list: SiteListVo[] = []; for (const item of iPageRecords) { const vo: SiteListVo = new SiteListVo(); Object.assign(vo, item); @@ -115,8 +115,8 @@ export class AuthSiteServiceImplService { siteInfoVo.setSiteAddons(this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("type", AddonActionEnum.ADDON.getCode()))); siteInfoVo.setApps(this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("type", AddonActionEnum.APP.getCode()))); }else{ - siteInfoVo.setSiteAddons(new ArrayList()); - siteInfoVo.setApps(new ArrayList()); + siteInfoVo.setSiteAddons([]); + siteInfoVo.setApps([]); } return siteInfoVo; } @@ -283,7 +283,7 @@ export class AuthSiteServiceImplService { MPJany /* TODO: QueryWrapper */ queryWrapper = new MPJany /* TODO: QueryWrapper */(); queryWrapper.select("site_id").eq("uid", RequestUtils.uid()).ne("site_id", RequestUtils.defaultSiteId()).eq("status", 1); const sysUserRoleList: SysUserRole[] = this.sysUserRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - const siteIds: number[] = new ArrayList(); + const siteIds: number[] = []; for (const sysUserRole of sysUserRoleList) { siteIds.push(sysUserRole.siteId); } @@ -294,7 +294,7 @@ export class AuthSiteServiceImplService { * getSiteGroup */ async getSiteGroup(...args: any[]): Promise { - const userCreateSiteVoList: UserCreateSiteVo[] = new ArrayList(); + const userCreateSiteVoList: UserCreateSiteVo[] = []; if(this.authService.isSuperAdmin()){ const siteGroupList: SiteGroup[] = this.siteGroupRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); for (const siteGroup of siteGroupList) { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-account-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-account-service-impl.service.ts index 54e2edfc..a7a68ffa 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-account-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-account-service-impl.service.ts @@ -35,7 +35,7 @@ export class MemberAccountServiceImplService { QueryMapperUtils.buildByTime(queryWrapper, "mal.create_time", searchParam.createTime); [MemberAccountLogVo[], number] iPage = memberAccountLogMapper.selectJoinPage(new Page<>(page, limit), MemberAccountLogVo.class, queryWrapper); - const list: MemberAccountLogListVo[] = new LinkedList(); + const list: MemberAccountLogListVo[] = []; for (const item of iPageRecords) { const vo: MemberAccountLogListVo = new MemberAccountLogListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-address-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-address-service-impl.service.ts index 69c3547c..befcffdd 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-address-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-address-service-impl.service.ts @@ -19,7 +19,7 @@ export class MemberAddressServiceImplService { if (CommonUtils.isNotEmpty(searchParam.memberId)) queryWrapper.eq("member_id", searchParam.memberId); const records: MemberAddress[] = this.memberAddressRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - const list: MemberAddressListVo[] = new LinkedList(); + const list: MemberAddressListVo[] = []; for (const item of records) { const vo: MemberAddressListVo = new MemberAddressListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-label-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-label-service-impl.service.ts index eed48e52..47f12cbe 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-label-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-label-service-impl.service.ts @@ -25,7 +25,7 @@ export class MemberLabelServiceImplService { queryWrapper.like("label_name", searchParam.getLabelName()); } [MemberLabel[], number] iPage = this.memberLabelRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: MemberLabelListVo[] = new LinkedList(); + const list: MemberLabelListVo[] = []; for (const item of iPageRecords) { const vo: MemberLabelListVo = new MemberLabelListVo(); const labelId: number = item.getLabelId(); @@ -118,7 +118,7 @@ export class MemberLabelServiceImplService { const labels: MemberLabel[] = this.memberLabelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); // 调用 selectList 方法 - const list: MemberLabelAllListVo[] = new LinkedList(); + const list: MemberLabelAllListVo[] = []; for (const item of labels) { const vo: MemberLabelAllListVo = new MemberLabelAllListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-level-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-level-service-impl.service.ts index f879f421..b0923ecb 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-level-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-level-service-impl.service.ts @@ -23,7 +23,7 @@ export class MemberLevelServiceImplService { if (CommonUtils.isNotEmpty(searchParam.getLevelName())) queryWrapper.like("level_name", searchParam.getLevelName()); [MemberLevel[], number] iPage = this.memberLevelRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: MemberLevelListVo[] = new LinkedList(); + const list: MemberLevelListVo[] = []; for (const item of iPageRecords) { const vo: MemberLevelListVo = new MemberLevelListVo(); Object.assign(vo, item); @@ -120,7 +120,7 @@ export class MemberLevelServiceImplService { const labels: MemberLevel[] = this.memberLevelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); // 调用 selectList 方法 - const list: MemberLevelAllListVo[] = new LinkedList(); + const list: MemberLevelAllListVo[] = []; for (const item of labels) { const vo: MemberLevelAllListVo = new MemberLevelAllListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-service-impl.service.ts index 40542689..98ca784d 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-service-impl.service.ts @@ -51,7 +51,7 @@ export class MemberServiceImplService { } [Member[], number] iPage = null; - const memberList: Member[] = new ArrayList(); + const memberList: Member[] = []; if (page > 0 && limit > 0) { iPage = this.memberRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); memberList = iPageRecords; @@ -65,7 +65,7 @@ export class MemberServiceImplService { levelMap = memberLevelMapper.selectBatchIds(levelIds).stream().collect(/* Collectors已删除 */.toMap(MemberLevel::getLevelId, e => e)); } - const list: MemberListVo[] = new LinkedList(); + const list: MemberListVo[] = []; for (const item of memberList) { const vo: MemberListVo = new MemberListVo(); Object.assign(vo, item); @@ -77,7 +77,7 @@ export class MemberServiceImplService { if (!item.getMemberLabel().isEmpty()) { const memberLabelArrays: JSONArray = JSONUtil.parseArray(vo.getMemberLabel()); if (memberLabelArrays != null && memberLabelArrays.length > 0) { - const memberLabelArray: MemberLabelAllListVo[] = new LinkedList(); + const memberLabelArray: MemberLabelAllListVo[] = []; const labelList: MemberLabel[] = this.memberLabelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).in("label_id", memberLabelArrays)); for (const labelItem of labelList) { const labelVo: MemberLabelAllListVo = new MemberLabelAllListVo(); @@ -117,7 +117,7 @@ export class MemberServiceImplService { if (StrUtil.isNotEmpty(model.getMemberLabel()) && ![model.getMemberLabel(]).isEmpty()) { const memberLabelArrays: JSONArray = JSONUtil.parseArray(vo.getMemberLabel()); if (memberLabelArrays != null && memberLabelArrays.length > 0) { - const memberLabelArray: MemberLabelAllListVo[] = new LinkedList(); + const memberLabelArray: MemberLabelAllListVo[] = []; const labelList: MemberLabel[] = this.memberLabelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).in("label_id", memberLabelArrays)); for (const item of labelList) { const labelVo: MemberLabelAllListVo = new MemberLabelAllListVo(); @@ -283,7 +283,7 @@ export class MemberServiceImplService { const members: Member[] = this.memberRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); // 调用 selectList 方法 - const list: MemberAllListVo[] = new LinkedList(); + const list: MemberAllListVo[] = []; for (const item of members) { const vo: MemberAllListVo = new MemberAllListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-sign-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-sign-service-impl.service.ts index 1dd07051..17052d8d 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-sign-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-sign-service-impl.service.ts @@ -33,7 +33,7 @@ export class MemberSignServiceImplService { } [MemberSign[], number] iPage = this.memberSignRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: MemberSignListVo[] = new LinkedList(); + const list: MemberSignListVo[] = []; for (const item of iPageRecords) { const vo: MemberSignListVo = new MemberSignListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/cloud-build-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/cloud-build-service-impl.service.ts index 975423aa..0dc7db2a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/cloud-build-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/cloud-build-service-impl.service.ts @@ -26,7 +26,7 @@ export class CloudBuildServiceImplService { async buildPreCheck(...args: any[]): Promise { const checkResult: Record = new Record(); checkResult.put("is_pass", true); - checkResult.put("dir", new HashMap()); + checkResult.put("dir", {}); return checkResult; } @@ -58,7 +58,7 @@ export class CloudBuildServiceImplService { actionQuery.put("data[product_key]", instance.getProductKey()); const actionToken: Record = this.niucloudService.getActionToken("cloudbuild", actionQuery); - Record = new HashMap(); + Record = {}; query.put("authorize_code", instance.getCode()); query.put("timestamp", Date.now() / 1000); query.put("token", actionToken == null ? "" : actionToken.getStr("token")); @@ -90,7 +90,7 @@ export class CloudBuildServiceImplService { const instance: NiucloudUtils = NiucloudUtils.getInstance(); - const query: Record = new HashMap(); + const query: Record = {}; query.put("authorize_code", instance.getCode()); query.put("timestamp", this.buildTask.getStr("timestamp")); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/niu-cloud-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/niu-cloud-service-impl.service.ts index 2c43515b..efbd1339 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/niu-cloud-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/niu-cloud-service-impl.service.ts @@ -15,7 +15,7 @@ export class NiuCloudServiceImplService { async getFrameworkLastVersion(...args: any[]): Promise { const instance: NiucloudUtils = NiucloudUtils.getInstance(); - const query: Record = new HashMap(); + const query: Record = {}; query.put("product_key", instance.getProductKey()); const data: Record = NiucloudUtils.Niucloud.get("store/framework/lastversion", query).getRecord("data"); @@ -35,13 +35,13 @@ export class NiuCloudServiceImplService { async getFrameworkVersionList(...args: any[]): Promise { const instance: NiucloudUtils = NiucloudUtils.getInstance(); - const query: Record = new HashMap(); + const query: Record = {}; query.put("product_key", instance.getProductKey()); const data: JSONArray = NiucloudUtils.Niucloud.get("store/framework/version", query).getJSONArray("data"); if (data == null) return null; - const list: FrameworkVersionListVo[] = new LinkedList(); + const list: FrameworkVersionListVo[] = []; for (const i of number = 0; i < data.length; i++) { list.push(Object.assign(new FrameworkVersionListVo(), data.getRecord(i)) /* TODO: 检查FrameworkVersionListVo构造函数 */); } @@ -54,7 +54,7 @@ export class NiuCloudServiceImplService { async getAuthinfo(...args: any[]): Promise { const instance: NiucloudUtils = NiucloudUtils.getInstance(); - const query: Record = new HashMap(); + const query: Record = {}; query.put("code", instance.getCode()); query.put("secret", instance.getSecret()); query.put("product_key", instance.getProductKey()); @@ -74,7 +74,7 @@ export class NiuCloudServiceImplService { async setAuthorize(...args: any[]): Promise { const instance: NiucloudUtils = NiucloudUtils.getInstance(); - const query: Record = new HashMap(); + const query: Record = {}; query.put("code", param.getAuthCode()); query.put("secret", param.getAuthSecret()); query.put("product_key", instance.getProductKey()); @@ -92,7 +92,7 @@ export class NiuCloudServiceImplService { async getModuleList(...args: any[]): Promise { const instance: NiucloudUtils = NiucloudUtils.getInstance(); - const query: Record = new HashMap(); + const query: Record = {}; query.put("code", instance.getCode()); query.put("secret", instance.getSecret()); query.put("product_key", instance.getProductKey()); @@ -100,7 +100,7 @@ export class NiuCloudServiceImplService { const addonList: JSONArray = NiucloudUtils.Niucloud.get("member_app_all", query).getJSONArray("data"); if (addonList == null && addonList.length == 0) return null; - const list: ModuleListVo[] = new LinkedList(); + const list: ModuleListVo[] = []; for (const i of number = 0; i < addonList.length; i++) { const item: Record = addonList.getRecord(i); const vo: ModuleListVo = Object.assign(new ModuleListVo(), item) /* TODO: 检查ModuleListVo构造函数 */; @@ -122,7 +122,7 @@ export class NiuCloudServiceImplService { async checkKey(...args: any[]): Promise { const instance: NiucloudUtils = NiucloudUtils.getInstance(); - const query: Record = new HashMap(); + const query: Record = {}; query.put("product_key", instance.getProductKey()); return NiucloudUtils.Niucloud.get("store/app_check/" + key, query).get("data", boolean.class); @@ -134,13 +134,13 @@ export class NiuCloudServiceImplService { async getAppVersionList(...args: any[]): Promise { const instance: NiucloudUtils = NiucloudUtils.getInstance(); - const query: Record = new HashMap(); + const query: Record = {}; query.put("product_key", instance.getProductKey()); query.put("app_key", param.appKey); const data: JSONArray = ObjectUtil.defaultIfNull(NiucloudUtils.Niucloud.get("store/app_version/list", query).get("data", JSONArray.class), new JSONArray()); - const list: AppVersionListVo[] = new LinkedList(); + const list: AppVersionListVo[] = []; for (const i of number = 0; i < data.length; i++) { list.push(Object.assign(new AppVersionListVo(), data.getRecord(i)) /* TODO: 检查AppVersionListVo构造函数 */); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/nui-sms-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/nui-sms-service-impl.service.ts index 1843a9ab..7718bd39 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/nui-sms-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/nui-sms-service-impl.service.ts @@ -15,7 +15,7 @@ export class NuiSmsServiceImplService { */ async captcha(...args: any[]): Promise { try { - const jsonObject: Record = NiucloudUtils.Niucloud.get(SEND_CAPTCHA_URL, new HashMap()); + const jsonObject: Record = NiucloudUtils.Niucloud.get(SEND_CAPTCHA_URL, {}); const result: Record = jsonObject.getRecord("data"); //删除null值 防止序列化报错 JacksonUtils.removeNull(result); @@ -30,7 +30,7 @@ export class NuiSmsServiceImplService { * sendMobileCode */ async sendMobileCode(...args: any[]): Promise { - const body: Record = new HashMap(); + const body: Record = {}; body.put("mobile", param.getMobile()); body.put("captcha_key", param.getCaptchaKey()); body.put("captcha_code", param.getCaptchaCode()); @@ -70,7 +70,7 @@ export class NuiSmsServiceImplService { */ async loginAccount(...args: any[]): Promise { const url: string = String.format(LOGIN_ACCOUNT_URL, param.getUsername()); - const body: Record = new HashMap(); + const body: Record = {}; body.put("username", param.getUsername()); body.put("password", param.getPassword()); try { @@ -110,7 +110,7 @@ export class NuiSmsServiceImplService { const newPassword: string = null; try { const resetPasswordUrl: string = String.format(RESET_PASSWORD_URL, param.getUsername()); - const resetPasswordBody: Record = new HashMap(); + const resetPasswordBody: Record = {}; resetPasswordBody.put("mobile", param.getMobile()); resetPasswordBody.put("code", param.getCode()); resetPasswordBody.put("key", param.key); @@ -138,7 +138,7 @@ export class NuiSmsServiceImplService { async accountInfo(...args: any[]): Promise { const infoUrl: string = String.format(ACCOUNT_INFO_URL, username); try { - const jsonObject: Record = NiucloudUtils.Niucloud.get(infoUrl, new HashMap()); + const jsonObject: Record = NiucloudUtils.Niucloud.get(infoUrl, {}); const result: Record = jsonObject.getRecord("data"); // 获取配置 const nyConfig: Record = getConfig(false); @@ -165,11 +165,11 @@ export class NuiSmsServiceImplService { throw new ApiException("牛云短信账号异常,请重新登录账号"); } const list: SysNotice[] = this.sysNoticeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); - const map: Record = new HashMap(); + const map: Record = {}; if (!CollectionUtils.isEmpty(list)) { map = list.collect(/* Collectors已删除 */.toMap(SysNotice::getKey, item => item)); } - const notice: TemplateListVo[] = new ArrayList(); + const notice: TemplateListVo[] = []; for (Map.Entry noticeMap : NoticeEnum.getNiuyunNotice().entrySet()) { const noticeInfoVo: TemplateListVo = new TemplateListVo(); BeanUtil.copyProperties(noticeMap.value, noticeInfoVo); @@ -196,7 +196,7 @@ export class NuiSmsServiceImplService { const niuSmsTemplates: NiuSmsTemplate[] = this.niuSmsTemplateRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) .eq("username", username) .eq("site_id", siteId)); - const templateMap: Record = new HashMap(); + const templateMap: Record = {}; if (!CollectionUtils.isEmpty(niuSmsTemplates)){ templateMap = niuSmsTemplates.collect(/* Collectors已删除 */.toMap(NiuSmsTemplate::getTemplateKey, item => item)); } @@ -204,7 +204,7 @@ export class NuiSmsServiceImplService { const sys: Addon = new Addon(); sys.key = "system"; addonList.push(0, sys); - const result: TemplateListVo[] = new ArrayList(); + const result: TemplateListVo[] = []; for (const addon of addonList) { for (const noticeInfoVo of notice) { if (addon.key === noticeInfoVo.getAddon()) { @@ -215,7 +215,7 @@ export class NuiSmsServiceImplService { auditInfo.set("audit_msg", templateMap.containsKey(noticeInfoVo.key) ? templateMap.get(noticeInfoVo.key).getAuditMsg() : ""); auditInfo.set("audit_status", templateMap.containsKey(noticeInfoVo.key) ? templateMap.get(noticeInfoVo.key).getAuditStatus() : TemplateAuditStatus.TEMPLATE_NOT_REPORT.getCode()); auditInfo.set("audit_status_name", TemplateAuditStatus.getByCode(auditInfo.getInt("audit_status")).getDescription()); - const paramsJson: string[] = new ArrayList(); + const paramsJson: string[] = []; if (templateMap.containsKey(noticeInfoVo.key)){ const paramJson: string = templateMap.get(noticeInfoVo.key).getParamJson(); if (CommonUtils.isNotEmpty(paramJson)){ @@ -225,7 +225,7 @@ export class NuiSmsServiceImplService { } Collections.sort(paramsJson); - const variable: string[] = new ArrayList(); + const variable: string[] = []; if (CommonUtils.isNotEmpty(noticeInfoVo.getVariable())) { variable.addAll(noticeInfoVo.getVariable().keySet()); } @@ -272,7 +272,7 @@ export class NuiSmsServiceImplService { const orderListUrl: string = String.format(ORDER_LIST_URL, username); const result: Record = null; try { - const orderListParam: Record = new HashMap(); + const orderListParam: Record = {}; orderListParam.put("out_trade_no", param.getOutTradeNo()); orderListParam.put("order_status", param.status); orderListParam.put("create_time_start", param.getCreateTimeStart()); @@ -295,7 +295,7 @@ export class NuiSmsServiceImplService { */ async accountSendList(...args: any[]): Promise { const accountSendUrl: string = String.format(ACCOUNT_SEND_LIST_URL, username); - const accountSendParam: Record = new HashMap(); + const accountSendParam: Record = {}; accountSendParam.put("mobile", param.getMobile()); accountSendParam.put("content", param.getContent()); accountSendParam.put("smsStatus", param.getSmsStatus()); @@ -343,7 +343,7 @@ export class NuiSmsServiceImplService { */ async editAccount(...args: any[]): Promise { const editAccountUrl: string = String.format(ACCOUNT_EDIT_URL, username); - const editAccountBody: Record = new HashMap(); + const editAccountBody: Record = {}; editAccountBody.put("new_mobile", param.getNewMobile()); editAccountBody.put("mobile", param.getMobile()); editAccountBody.put("code", param.getCode()); @@ -414,7 +414,7 @@ export class NuiSmsServiceImplService { * getSmsPackageList */ async getSmsPackageList(...args: any[]): Promise { - const pageListParam: Record = new HashMap(); + const pageListParam: Record = {}; pageListParam.put("package_name", param.getPackageName()); pageListParam.put("sms_num", param.getSmsNum()); pageListParam.put("price_start", param.getPriceStart()); @@ -442,7 +442,7 @@ export class NuiSmsServiceImplService { */ async orderCalculate(...args: any[]): Promise { const orderCalculateUrl: string = String.format(ORDER_CALCULATE_URL, username); - const orderCalculateBody: Record = new HashMap(); + const orderCalculateBody: Record = {}; orderCalculateBody.put("package_id", param.getPackageId()); try { const jsonObject: Record = NiucloudUtils.Niucloud.post(orderCalculateUrl, orderCalculateBody); @@ -461,7 +461,7 @@ export class NuiSmsServiceImplService { */ async createOrder(...args: any[]): Promise { const orderCreateUrl: string = String.format(ORDER_CREATE_URL, username); - const orderCreateBody: Record = new HashMap(); + const orderCreateBody: Record = {}; orderCreateBody.put("package_id", param.getPackageId()); try { const jsonObject: Record = NiucloudUtils.Niucloud.post(orderCreateUrl, orderCreateBody); @@ -489,7 +489,7 @@ export class NuiSmsServiceImplService { } const returnUrl: string = String.format("%s://%s/site/setting/sms/pay", protocol, host); const payInfoUrl: string = String.format(ORDER_PAY_URL, username); - const payInfoBody: Record = new HashMap(); + const payInfoBody: Record = {}; payInfoBody.put("notify_url", payInfoUrl); payInfoBody.put("return_url", returnUrl); payInfoBody.put("out_trade_no", outTradeNo); @@ -511,7 +511,7 @@ export class NuiSmsServiceImplService { async getOrderInfo(...args: any[]): Promise { const orderInfoUrl: string = String.format(ORDER_INFO_URL, username, outTradeNo); try { - const jsonObject: Record = NiucloudUtils.Niucloud.get(orderInfoUrl, new HashMap()); + const jsonObject: Record = NiucloudUtils.Niucloud.get(orderInfoUrl, {}); const result: Record = jsonObject.getRecord("data"); //删除null值 防止序列化报错 JacksonUtils.removeNull(result); @@ -528,7 +528,7 @@ export class NuiSmsServiceImplService { async getOrderStatus(...args: any[]): Promise { const orderStatusUrl: string = String.format(ORDER_STATUS_URL, username, outTradeNo); try { - const jsonObject: Record = NiucloudUtils.Niucloud.get(orderStatusUrl, new HashMap()); + const jsonObject: Record = NiucloudUtils.Niucloud.get(orderStatusUrl, {}); const result: Record = jsonObject.getRecord("data"); //删除null值 防止序列化报错 JacksonUtils.removeNull(result); @@ -567,7 +567,7 @@ export class NuiSmsServiceImplService { const config: Record = getConfig(false); const templateCreateUrl: string = String.format(TEMPLATE_ADD_URL, username); - const templateCreateBody: Record = new HashMap(); + const templateCreateBody: Record = {}; templateCreateBody.put("temName", path.basename(templateInfo)); templateCreateBody.put("temType", param.getTemplateType()); templateCreateBody.put("temContent", templateInfo.getSms().get("content")); @@ -618,7 +618,7 @@ export class NuiSmsServiceImplService { */ async templateDelete(...args: any[]): Promise { const config: Record = getConfig(false); - const deleteBody: Record = new HashMap(); + const deleteBody: Record = {}; const time: number = DateUtil.currentSeconds(); deleteBody.put("tKey", time); deleteBody.put("password", DigestUtil.md5Hex(DigestUtil.md5Hex(config.getStr("password")) + time)); @@ -646,7 +646,7 @@ export class NuiSmsServiceImplService { throw new AdminException("短信模版暂未报备"); } const orderCreateUrl: string = String.format(TEMPLATE_INFO_URL, username); - const templateInfoParam: Record = new HashMap(); + const templateInfoParam: Record = {}; templateInfoParam.put("tem_id", niuSmsTemplate.getTemplateId()); try { const jsonObject: Record = NiucloudUtils.Niucloud.get(orderCreateUrl, templateInfoParam); @@ -687,7 +687,7 @@ export class NuiSmsServiceImplService { const config: Record = getConfig(true); config.put("default", CommonUtils.isNotEmpty(param.getDefaultVal()) ? param.getDefaultVal() : config.getOrDefault("default", "")); const niuSmsConfig: Record = config.getRecord(NIUYUN); - const newNiuSmsConfig: Record = new HashMap(); + const newNiuSmsConfig: Record = {}; newNiuSmsConfig.put("username", CommonUtils.isNotEmpty(param.getUsername()) ? param.getUsername() : niuSmsConfig != null ? niuSmsConfig.getOrDefault("username", "") : ""); newNiuSmsConfig.put("password", CommonUtils.isNotEmpty(param.getPassword()) ? param.getPassword() : niuSmsConfig != null ? niuSmsConfig.getOrDefault("password", "") : ""); newNiuSmsConfig.put("signature", CommonUtils.isNotEmpty(param.getSignature()) ? param.getSignature() : niuSmsConfig != null ? niuSmsConfig.getOrDefault("signature", "") : ""); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-channel-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-channel-service-impl.service.ts index 31d7ca53..58a0c2b1 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-channel-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-channel-service-impl.service.ts @@ -62,7 +62,7 @@ export class PayChannelServiceImplService { .eq("channel", channel) ); - const list: PayChannelListVo[] = new LinkedList(); + const list: PayChannelListVo[] = []; for (const item of payChannel) { const vo: PayChannelListVo = new PayChannelListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-refund-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-refund-service-impl.service.ts index bdfe18b4..22aa62d5 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-refund-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-refund-service-impl.service.ts @@ -26,7 +26,7 @@ export class PayRefundServiceImplService { const payTypeEnum: Record = PayTypeEnum.type; [PayRefund[], number] iPage = this.payRefundRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: PayRefundListVo[] = new LinkedList(); + const list: PayRefundListVo[] = []; for (const item of iPageRecords) { const vo: PayRefundListVo = new PayRefundListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-service-impl.service.ts index 20736005..68e7d500 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-service-impl.service.ts @@ -20,7 +20,7 @@ export class PayServiceImplService { queryWrapper.orderByDesc("id"); [Pay[], number] iPage = this.payRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: PayListVo[] = new LinkedList(); + const list: PayListVo[] = []; for (const item of iPageRecords) { const vo: PayListVo = new PayListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-account-log-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-account-log-service-impl.service.ts index a218ffcd..903d7f7c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-account-log-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-account-log-service-impl.service.ts @@ -31,7 +31,7 @@ export class SiteAccountLogServiceImplService { } queryWrapper.orderByDesc("create_time"); [SiteAccountLog[], number] iPage = this.siteAccountLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: SiteAccountLogListVo[] = new LinkedList(); + const list: SiteAccountLogListVo[] = []; for (const item of iPageRecords) { const vo: SiteAccountLogListVo = new SiteAccountLogListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-group-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-group-service-impl.service.ts index 63191bed..5bb0bd33 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-group-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-group-service-impl.service.ts @@ -26,7 +26,7 @@ export class SiteGroupServiceImplService { //获取所有的addon const addonList: Addon[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); - const list: SiteGroupListVo[] = new LinkedList(); + const list: SiteGroupListVo[] = []; for (const item of iPageRecords) { const vo: SiteGroupListVo = new SiteGroupListVo(); vo.setGroupId(item.getGroupId()); @@ -38,10 +38,10 @@ export class SiteGroupServiceImplService { vo.setAddon(addonJson); const appJson: JSONArray = JSONUtil.parseArray(item.getApp()); vo.setApp(appJson); - const addonStr: string[] = new ArrayList(); - const appStr: string[] = new ArrayList(); - const appList: SiteGroupListVo.IconAndTitle[] = new ArrayList(); - const addonListResult: SiteGroupListVo.IconAndTitle[] = new ArrayList(); + const addonStr: string[] = []; + const appStr: string[] = []; + const appList: SiteGroupListVo.IconAndTitle[] = []; + const addonListResult: SiteGroupListVo.IconAndTitle[] = []; for (const addon of addonList) { if(addonJson.includes(addon.key)){ @@ -192,7 +192,7 @@ export class SiteGroupServiceImplService { * getUserSiteGroupAll */ async getUserSiteGroupAll(...args: any[]): Promise { - const siteGroupListVoList: SiteGroupListVo[] = new ArrayList(); + const siteGroupListVoList: SiteGroupListVo[] = []; const siteGroupList: SiteGroup[] = this.siteGroupRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); for (const siteGroup of siteGroupList) { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-service-impl.service.ts index ed3e0753..42543440 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-service-impl.service.ts @@ -81,7 +81,7 @@ export class SiteServiceImplService { [SiteListVo[], number] iPage = siteMapper.selectJoinPage(new Page<>(page, limit), SiteListVo.class, queryWrapper); - const list: SiteListVo[] = new LinkedList(); + const list: SiteListVo[] = []; for (const item of iPageRecords) { const vo: SiteListVo = new SiteListVo(); Object.assign(vo, item); @@ -150,7 +150,7 @@ export class SiteServiceImplService { event.setSiteGroup(siteGroup); EventAndSubscribeOfPublisher.publishAll(event); - const param: Record = new HashMap(); + const param: Record = {}; param.put("site_id", siteId); param.put("main_app", siteGroup.getApp()); param.put("tag", "add"); @@ -384,7 +384,7 @@ export class SiteServiceImplService { const authMenuList: JSONArray = this.authService.getAuthMenuTreeList(1, "all"); // 将菜单列表转换为Map，便于通过menu_key查找 - const authMenuMap: Record> = new HashMap(); + const authMenuMap: Record> = {}; for (const i of number = 0; i < authMenuList.length; i++) { const menu: Record = authMenuList.getRecord(i); authMenuMap.put(menu.get("menu_key").toString(), menu); @@ -393,18 +393,18 @@ export class SiteServiceImplService { // 获取"addon"菜单 const addonMenu: Record = authMenuMap.get("addon"); if (addonMenu == null) { - return new SpecialMenuListVo("addon", new ArrayList()); + return new SpecialMenuListVo("addon", []); } const showList: Record = showCustomer(false); const addonChildMenus: AddonChildMenuEnum.MenuConfig[] = AddonChildMenuEnum.getAll(); - const menuList: SpecialMenuListVo.MenuVo[] = new ArrayList(); + const menuList: SpecialMenuListVo.MenuVo[] = []; // 遍历插件子菜单，构建菜单列表 for (AddonChildMenuEnum.MenuConfig item : addonChildMenus) { const menuKey: string = item.key; - const menuKeyList: string[] = new ArrayList(); + const menuKeyList: string[] = []; if (showList.containsKey(menuKey) && showList.get(menuKey) instanceof Map) { const menuItem: Record = (Record) showList.get(menuKey); if (menuItem.containsKey("list") && menuItem.get("list") instanceof List) { @@ -431,7 +431,7 @@ export class SiteServiceImplService { tempMenu.status = "1"; tempMenu.setIsShow("1"); - const children: SpecialMenuListVo.MenuVo[] = new ArrayList(); + const children: SpecialMenuListVo.MenuVo[] = []; const authChildren: JSONArray = addonMenu.getJSONArray("children"); if (authChildren != null) { for (const j of number = 0; j < authChildren.length; j++) { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-user-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-user-service-impl.service.ts index a9cee81d..18cb8f80 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-user-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-user-service-impl.service.ts @@ -29,7 +29,7 @@ export class SiteUserServiceImplService { userRoleMPJQueryWrapper.orderByDesc("nsur.id"); [SiteUserVo[], number] iPage = sysUserRoleMapper.selectJoinPage(new Page<>(page, limit), SiteUserVo.class, userRoleMPJQueryWrapper); for (const siteUserVo of iPageRecords) { - const roleArray: string[] = new ArrayList(); + const roleArray: string[] = []; if(CommonUtils.isNotEmpty(siteUserVo.getRoleIds()) && JSONUtil.parseArray(siteUserVo.getRoleIds()).size()>0){ any /* TODO: QueryWrapper */ roleQueryWrapper=new QueryWrapper(); roleQueryWrapper.in("role_id", JSONUtil.parseArray(siteUserVo.getRoleIds())); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-hour-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-hour-service-impl.service.ts index 99e4bbab..895569df 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-hour-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-hour-service-impl.service.ts @@ -20,7 +20,7 @@ export class StatHourServiceImplService { queryWrapper.orderByDesc("id"); [StatHour[], number] iPage = this.statHourRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: StatHourListVo[] = new LinkedList(); + const list: StatHourListVo[] = []; for (const item of iPageRecords) { const vo: StatHourListVo = new StatHourListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-service-impl.service.ts index 9fe3a71b..d97898b3 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-service-impl.service.ts @@ -71,9 +71,9 @@ export class StatServiceImplService { */ const memberCountVo: StatDateVo = new StatDateVo(); const siteCountVo: StatDateVo = new StatDateVo(); - const dates: string[] = new ArrayList(); - const memberValues: number[] = new ArrayList(); - const siteValues: number[] = new ArrayList(); + const dates: string[] = []; + const memberValues: number[] = []; + const siteValues: number[] = []; const statNum: number = 7; for (const i of number = 0; i <= statNum; i++) { @@ -102,12 +102,12 @@ export class StatServiceImplService { * 会员性别类型统计 */ const memberStat: StatTypeVo = new StatTypeVo(); - const sexlist: string[] = new ArrayList(); + const sexlist: string[] = []; sexlist.push(SexEnum.path.basename(MAN)); sexlist.push(SexEnum.path.basename(WOMAN)); sexlist.push(SexEnum.path.basename(UNKNOWN)); - const sexCountList: number[] = new ArrayList(); + const sexCountList: number[] = []; const sexMemberParam: MemberStatSearchParam = new MemberStatSearchParam(); sexMemberParam.setSex(SexEnum.MAN.value); const manSexCount: number = this.coreMemberService.getMemberCount(sexMemberParam); @@ -124,8 +124,8 @@ export class StatServiceImplService { * 站点分组 统计 */ const siteGroupStat: StatTypeVo = new StatTypeVo(); - const grouplist: string[] = new ArrayList(); - const groupCountList: number[] = new ArrayList(); + const grouplist: string[] = []; + const groupCountList: number[] = []; const groupList: SiteGroup[] = this.siteGroupService.getAll(); for (const siteGroup of groupList) { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-agreement-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-agreement-service-impl.service.ts index 19755187..77946b17 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-agreement-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-agreement-service-impl.service.ts @@ -14,7 +14,7 @@ export class SysAgreementServiceImplService { */ async list(...args: any[]): Promise { const typeJson: Record = AgreementEnum.type; - const list: SysAgreementListVo[] = new ArrayList(); + const list: SysAgreementListVo[] = []; for (Map.Entry map : typeJson.entrySet()) { const vo: SysAgreementListVo = new SysAgreementListVo(); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-area-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-area-service-impl.service.ts index cb22ee09..aa82c6e2 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-area-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-area-service-impl.service.ts @@ -63,7 +63,7 @@ export class SysAreaServiceImplService { queryWrapper.orderByDesc(["sort", "id"]); [SysArea[], number] iPage = this.sysAreaRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: SysAreaListVo[] = new LinkedList(); + const list: SysAreaListVo[] = []; for (const item of iPageRecords) { const vo: SysAreaListVo = new SysAreaListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-attachment-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-attachment-service-impl.service.ts index 034f54e4..cf46b7cd 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-attachment-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-attachment-service-impl.service.ts @@ -25,7 +25,7 @@ export class SysAttachmentServiceImplService { if (CommonUtils.isNotEmpty(searchParam.getRealName())) queryWrapper.like("real_name", searchParam.getRealName()); [SysAttachment[], number] iPage = this.sysAttachmentRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: SysAttachmentListVo[] = new LinkedList(); + const list: SysAttachmentListVo[] = []; for (const item of iPageRecords) { const vo: SysAttachmentListVo = new SysAttachmentListVo(); Object.assign(vo, item); @@ -106,7 +106,7 @@ export class SysAttachmentServiceImplService { const categorys: SysAttachmentCategory[] = this.sysAttachmentCategoryRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); // 调用 selectList 方法 - const list: SysAttachmentCategoryListVo[] = new LinkedList(); + const list: SysAttachmentCategoryListVo[] = []; for (const item of categorys) { const vo: SysAttachmentCategoryListVo = new SysAttachmentCategoryListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-backup-records-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-backup-records-service-impl.service.ts index 50f29ed5..88c99032 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-backup-records-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-backup-records-service-impl.service.ts @@ -27,7 +27,7 @@ export class SysBackupRecordsServiceImplService { } [SysBackupRecords[], number] iPage = this.sysBackupRecordsRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: SysBackupRecordsListVo[] = new ArrayList(); + const list: SysBackupRecordsListVo[] = []; for (const item of iPageRecords) { const vo: SysBackupRecordsListVo = new SysBackupRecordsListVo(); Object.assign(vo, item); @@ -76,7 +76,7 @@ export class SysBackupRecordsServiceImplService { const queryWrapper: QueryWrapper = /* TODO: any /* TODO: QueryWrapper */需改写为TypeORM的where条件对象 */; if (delParam.getIds() instanceof ArrayList) { - const intArray: number[] = new ArrayList(); + const intArray: number[] = []; ((ArrayList) delParam.getIds()).forEach(item => { if (!item) throw new BadRequestException("id不能为空"); intArray.push(item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-menu-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-menu-service-impl.service.ts index 374c2bc3..6575843a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-menu-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-menu-service-impl.service.ts @@ -169,7 +169,7 @@ export class SysMenuServiceImplService { //排除菜单 if(ObjectUtil.isNotNull(paichuList) && paichuList.length>0){ - const paichuArr: string[] = new ArrayList(); + const paichuArr: string[] = []; for (const i of number = 0; i { - const menuList: SysMenu[] = new ArrayList(); + const menuList: SysMenu[] = []; try { any /* TODO: QueryWrapper */ queryWrapper = new QueryWrapper(); if (CommonUtils.isNotEmpty(appType)) { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-log-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-log-service-impl.service.ts index 41801f28..4076ced7 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-log-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-log-service-impl.service.ts @@ -26,7 +26,7 @@ export class SysNoticeLogServiceImplService { const noticeEnum: Record = NoticeEnum.getNotice(); [SysNoticeLog[], number] iPage = this.sysNoticeLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: SysNoticeLogListVo[] = new LinkedList(); + const list: SysNoticeLogListVo[] = []; for (const item of iPageRecords) { const vo: SysNoticeLogListVo = new SysNoticeLogListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-service-impl.service.ts index 22b360e5..c72f830e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-service-impl.service.ts @@ -20,7 +20,7 @@ export class SysNoticeServiceImplService { queryWrapper.orderByDesc("id"); [SysNotice[], number] iPage = this.sysNoticeRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: SysNoticeListVo[] = new LinkedList(); + const list: SysNoticeListVo[] = []; for (const item of iPageRecords) { const vo: SysNoticeListVo = new SysNoticeListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-sms-log-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-sms-log-service-impl.service.ts index aa9ac4a3..842bc285 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-sms-log-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-sms-log-service-impl.service.ts @@ -28,7 +28,7 @@ export class SysNoticeSmsLogServiceImplService { const notice: Record = NoticeEnum.getNotice(); [SysNoticeSmsLog[], number] iPage = this.sysNoticeSmsLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: SysNoticeSmsLogListVo[] = new LinkedList(); + const list: SysNoticeSmsLogListVo[] = []; for (const item of iPageRecords) { const vo: SysNoticeSmsLogListVo = new SysNoticeSmsLogListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-poster-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-poster-service-impl.service.ts index ed38a584..94f1733d 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-poster-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-poster-service-impl.service.ts @@ -25,7 +25,7 @@ export class SysPosterServiceImplService { if (CommonUtils.isNotEmpty(searchParam.type)) queryWrapper.eq("type", searchParam.type); [SysPoster[], number] iPage = this.sysPosterRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: SysPosterListVo[] = new LinkedList(); + const list: SysPosterListVo[] = []; for (const item of iPageRecords) { const vo: SysPosterListVo = new SysPosterListVo(); Object.assign(vo, item); @@ -46,7 +46,7 @@ export class SysPosterServiceImplService { if (CommonUtils.isNotEmpty(searchParam.type)) queryWrapper.eq("type", searchParam.type); const records: SysPoster[] = this.sysPosterRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - const list: SysPosterListVo[] = new LinkedList(); + const list: SysPosterListVo[] = []; for (const item of records) { const vo: SysPosterListVo = new SysPosterListVo(); Object.assign(vo, item); @@ -205,7 +205,7 @@ export class SysPosterServiceImplService { getPosterParam.type = param.type; getPosterParam.siteId = this.requestContext.siteId; getPosterParam.setChannel(ObjectUtil.defaultIfNull(param.getChannel(), "h5")); - const posterParam: Record = new HashMap(); + const posterParam: Record = {}; posterParam.put("mode", "preview"); getPosterParam.setParam(posterParam); getPosterParam.setIsThrowException(true); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-service-impl.service.ts index 895b3cb5..d6ce4e47 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-service-impl.service.ts @@ -27,7 +27,7 @@ export class SysPrinterServiceImplService { } [SysPrinter[], number] iPage = this.sysPrinterRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: SysPrinterListVo[] = new LinkedList(); + const list: SysPrinterListVo[] = []; for (const item of iPageRecords) { const vo: SysPrinterListVo = new SysPrinterListVo(); Object.assign(vo, item); @@ -52,7 +52,7 @@ export class SysPrinterServiceImplService { queryWrapper.like("printer_name", param.getPrinterName()); } - const list: SysPrinterListVo[] = new LinkedList(); + const list: SysPrinterListVo[] = []; for (const item of this.sysPrinterRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) { const vo: SysPrinterListVo = new SysPrinterListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-template-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-template-service-impl.service.ts index 1c128ea9..3afd2375 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-template-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-template-service-impl.service.ts @@ -32,7 +32,7 @@ export class SysPrinterTemplateServiceImplService { } [SysPrinterTemplate[], number] iPage = this.sysPrinterTemplateRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: SysPrinterTemplateListVo[] = new LinkedList(); + const list: SysPrinterTemplateListVo[] = []; for (const item of iPageRecords) { const vo: SysPrinterTemplateListVo = new SysPrinterTemplateListVo(); Object.assign(vo, item); @@ -63,7 +63,7 @@ export class SysPrinterTemplateServiceImplService { queryWrapper.eq("template_type", searchParam.getTemplateType()); } - const voList: SysPrinterTemplateListVo[] = new LinkedList(); + const voList: SysPrinterTemplateListVo[] = []; for (const item of this.sysPrinterTemplateRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) { const vo: SysPrinterTemplateListVo = new SysPrinterTemplateListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-role-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-role-service-impl.service.ts index d43d0642..57d6902e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-role-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-role-service-impl.service.ts @@ -23,7 +23,7 @@ export class SysRoleServiceImplService { queryWrapper.like("role_name", searchParam.getRoleName()); } [SysRole[], number] iPage = this.sysRoleRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: SysRoleListVo[] = new LinkedList(); + const list: SysRoleListVo[] = []; for (const item of iPageRecords) { const vo: SysRoleListVo = new SysRoleListVo(); Object.assign(vo, item); @@ -135,7 +135,7 @@ export class SysRoleServiceImplService { queryWrapper.eq("site_id", this.requestContext.siteId); queryWrapper.eq("status", 1); const roleList: SysRole[] = this.sysRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - const sysRoleListVoList: SysRoleListVo[] = new ArrayList(); + const sysRoleListVoList: SysRoleListVo[] = []; for (const sysRole of roleList) { const vo: SysRoleListVo = new SysRoleListVo(); Object.assign(vo, sysRole); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-schedule-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-schedule-service-impl.service.ts index d7549e09..f62c1540 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-schedule-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-schedule-service-impl.service.ts @@ -63,7 +63,7 @@ export class SysScheduleServiceImplService { queryWrapper.orderByDesc(SysSchedule::getSort, SysSchedule::getId); [SysSchedule[], number] sysSchedulePage = this.sysScheduleRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); // 返回结果集 - const sysScheduleListVoList: SysScheduleListVo[] = new LinkedList(); + const sysScheduleListVoList: SysScheduleListVo[] = []; for (const sysSchedule of sysSchedulePageRecords) { const sysScheduleListVo: SysScheduleListVo = new SysScheduleListVo(); Object.assign(sysScheduleListVo, sysSchedule); @@ -176,7 +176,7 @@ export class SysScheduleServiceImplService { * template */ async template(...args: any[]): Promise { - const sysScheduleTemplateVoList: SysScheduleTemplateVo[] = new ArrayList(); + const sysScheduleTemplateVoList: SysScheduleTemplateVo[] = []; const jobKeys: string[] = JobProviderFactory.jobKeys(); for (const jobKey of jobKeys) { const jobInfo: JobInfo = JobProviderFactory.getJobInfo(jobKey); @@ -226,7 +226,7 @@ export class SysScheduleServiceImplService { QueryMapperUtils.buildByTime(qw, SysScheduleLog::getExecuteTime, searchParam.getExecuteTime()); } any /* TODO: Page */ sysScheduleLogPage = this.sysScheduleLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), qw); - const result: SysScheduleLogListVo[] = new ArrayList(); + const result: SysScheduleLogListVo[] = []; sysScheduleLogPageRecords.forEach(sysScheduleLog => { const sysScheduleLogListVo: SysScheduleLogListVo = new SysScheduleLogListVo(); Object.assign(sysScheduleLogListVo, sysScheduleLog); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-upgrade-records-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-upgrade-records-service-impl.service.ts index 0d572b22..3db45009 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-upgrade-records-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-upgrade-records-service-impl.service.ts @@ -27,7 +27,7 @@ export class SysUpgradeRecordsServiceImplService { } [SysUpgradeRecords[], number] iPage = this.sysUpgradeRecordsRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: SysUpgradeRecordsListVo[] = new ArrayList(); + const list: SysUpgradeRecordsListVo[] = []; for (const item of iPageRecords) { const vo: SysUpgradeRecordsListVo = new SysUpgradeRecordsListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-log-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-log-service-impl.service.ts index 3093a23e..8cc3843c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-log-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-log-service-impl.service.ts @@ -31,7 +31,7 @@ export class SysUserLogServiceImplService { } [SysUserLog[], number] iPage = this.sysUserLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: SysUserLogListVo[] = new LinkedList(); + const list: SysUserLogListVo[] = []; for (const item of iPageRecords) { const vo: SysUserLogListVo = new SysUserLogListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-service-impl.service.ts index 6d0d36fe..e3ba4c45 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-service-impl.service.ts @@ -52,7 +52,7 @@ export class SysUserServiceImplService { [SysUser[], number] iPage = this.sysUserRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: SysUserListVo[] = new LinkedList(); + const list: SysUserListVo[] = []; for (const item of iPageRecords) { const vo: SysUserListVo = new SysUserListVo(); Object.assign(vo, item); @@ -106,7 +106,7 @@ export class SysUserServiceImplService { //添加用户建站限制 const createSiteLimitParamList: SysCreateSiteLimitParam[] = addParam.getCreateSiteLimit(); - const addList: UserCreateSiteLimit[] = new ArrayList(); + const addList: UserCreateSiteLimit[] = []; if (ObjectUtil.isNotNull(createSiteLimitParamList) && createSiteLimitParamList.length > 0) { for (const sysCreateSiteLimitParam of createSiteLimitParamList) { const userCreateSiteLimit: UserCreateSiteLimit = new UserCreateSiteLimit(); @@ -276,7 +276,7 @@ export class SysUserServiceImplService { */ async getUserCreateSiteLimit(...args: any[]): Promise { const userCreateSiteLimitList: UserCreateSiteLimit[] = this.userCreateSiteLimitRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); - const userCreateSiteLimitVoList: SysUserCreateSiteLimitVo[] = new ArrayList(); + const userCreateSiteLimitVoList: SysUserCreateSiteLimitVo[] = []; for (const item of userCreateSiteLimitList) { const userCreateSiteLimitVo: SysUserCreateSiteLimitVo = new SysUserCreateSiteLimitVo(); BeanUtil.copyProperties(item, userCreateSiteLimitVo); @@ -371,7 +371,7 @@ export class SysUserServiceImplService { const adminUsers: SysUser[] = this.sysUserRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); // 5. 查询无角色用户 - const noRoleUsers: SysUser[] = new ArrayList(); + const noRoleUsers: SysUser[] = []; const noRoleUserIds: number[] = userAll .map(SysUser::getUid) .filter(uid => !allRoleUserIds.includes(uid)) diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/system-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/system-service-impl.service.ts index cef6c0f4..83290492 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/system-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/system-service-impl.service.ts @@ -40,7 +40,7 @@ export class SystemServiceImplService { const vo: SpreadQrcodeVo = new SpreadQrcodeVo(); try { - const data: Record = new HashMap(); + const data: Record = {}; for (SpreadQrcodeParam.Param qrcodeParam : param.getParams()) { const jsonArray: JSONArray = JSONUtil.parseArray(qrcodeParam); const jsonObject: Record = JsonUtils.parseObject(jsonArray); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upgrade/impl/upgrade-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upgrade/impl/upgrade-service-impl.service.ts index 70fafc3d..2686bfb2 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upgrade/impl/upgrade-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upgrade/impl/upgrade-service-impl.service.ts @@ -83,10 +83,10 @@ export class UpgradeServiceImplService { const instance: NiucloudUtils = NiucloudUtils.getInstance(); const vo: UpgradeContentVo = new UpgradeContentVo(); - const apps: Map[] = new LinkedList(); + const apps: Map[] = []; if ((!addon || addon.length === 0)) { - const query: Record = new HashMap(); + const query: Record = {}; query.put("product_key", instance.getProductKey()); query.put("app_key", this.appConfig.appKey); query.put("version", this.appConfig.version); @@ -94,7 +94,7 @@ export class UpgradeServiceImplService { } else { for (const key of addon.split(",")) { const addonModel: Addon = this.addonRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).select("version,type")); - const query: Record = new HashMap(); + const query: Record = {}; query.put("product_key", instance.getProductKey()); query.put("app_key", key); query.put("version", addonModel.version); @@ -146,7 +146,7 @@ export class UpgradeServiceImplService { const actionToken: Record = this.niucloudService.getActionToken("upgrade", actionQuery); - Record = new HashMap(); + Record = {}; query.put("authorize_code", instance.getCode()); query.put("token", actionToken == null ? "" : actionToken.getStr("token")); const response: HttpResponse = new NiucloudUtils.Cloud().build("cloud/upgrade").query(query).method(Method.GET).execute(); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verifier-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verifier-service-impl.service.ts index 70bdae8c..c97fb333 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verifier-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verifier-service-impl.service.ts @@ -23,7 +23,7 @@ export class VerifierServiceImplService { queryWrapper.orderByDesc("id"); [VerifierVo[], number] iPage = verifierMapper.selectJoinPage(new Page<>(page, limit), VerifierVo.class, queryWrapper); - const list: VerifierListVo[] = new LinkedList(); + const list: VerifierListVo[] = []; for (const item of iPageRecords) { const vo: VerifierListVo = new VerifierListVo(); Object.assign(vo, item); @@ -49,7 +49,7 @@ export class VerifierServiceImplService { const verifierList: VerifierVo[] = verifierMapper.selectJoinList(VerifierVo.class, queryWrapper); - const list: VerifierListVo[] = new LinkedList(); + const list: VerifierListVo[] = []; for (const item of verifierList) { const vo: VerifierListVo = new VerifierListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verify-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verify-service-impl.service.ts index e2f2e94b..43be8753 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verify-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verify-service-impl.service.ts @@ -31,7 +31,7 @@ export class VerifyServiceImplService { } [VerifyVo[], number] iPage = verifyMapper.selectJoinPage(new Page<>(page, limit), VerifyVo.class, queryWrapper); - const list: VerifyListVo[] = new LinkedList(); + const list: VerifyListVo[] = []; for (const item of iPageRecords) { const vo: VerifyListVo = new VerifyListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-config-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-config-service-impl.service.ts index f14d401d..c35b7c91 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-config-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-config-service-impl.service.ts @@ -50,12 +50,12 @@ export class WeappConfigServiceImplService { const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId); this.wxOpenMaService.modifyDomain( "set", - CommonUtils.isNotEmpty(param.getRequestdomain()) ? [param.getRequestdomain(].split(";")) : new LinkedList(), - CommonUtils.isNotEmpty(param.getWsrequestdomain())? [param.getWsrequestdomain(].split(";")) : new LinkedList(), - CommonUtils.isNotEmpty(param.getUploaddomain())? [param.getUploaddomain(].split(";")) : new LinkedList(), - CommonUtils.isNotEmpty(param.getDownloaddomain())? [param.getDownloaddomain(].split(";")) : new LinkedList(), - CommonUtils.isNotEmpty(param.getTcpdomain())? [param.getTcpdomain(].split(";")) : new LinkedList(), - CommonUtils.isNotEmpty(param.getUdpdomain())? [param.getUdpdomain(].split(";")) : new LinkedList() + CommonUtils.isNotEmpty(param.getRequestdomain()) ? [param.getRequestdomain(].split(";")) : [], + CommonUtils.isNotEmpty(param.getWsrequestdomain())? [param.getWsrequestdomain(].split(";")) : [], + CommonUtils.isNotEmpty(param.getUploaddomain())? [param.getUploaddomain(].split(";")) : [], + CommonUtils.isNotEmpty(param.getDownloaddomain())? [param.getDownloaddomain(].split(";")) : [], + CommonUtils.isNotEmpty(param.getTcpdomain())? [param.getTcpdomain(].split(";")) : [], + CommonUtils.isNotEmpty(param.getUdpdomain())? [param.getUdpdomain(].split(";")) : [] ); } catch (e) { throw new BadRequestException(e.message); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-template-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-template-service-impl.service.ts index 7df222b7..0c02bb46 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-template-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-template-service-impl.service.ts @@ -16,7 +16,7 @@ export class WeappTemplateServiceImplService { const addonNoticeList: AddonNoticeListVo[] = this.coreNoticeService.getAddonList(this.requestContext.siteId); for (const item of addonNoticeList) { - const filter: NoticeInfoVo[] = new LinkedList(); + const filter: NoticeInfoVo[] = []; for (const noticeItem of item.getNotice()) { if (noticeItem.getSupport_type().indexOf("weapp") != -1) { filter.push(noticeItem); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-version-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-version-service-impl.service.ts index e6ab3def..76cdce32 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-version-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-version-service-impl.service.ts @@ -23,7 +23,7 @@ export class WeappVersionServiceImplService { [WeappVersion[], number] iPage = this.weappVersionRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: WeappVersionListVo[] = new LinkedList(); + const list: WeappVersionListVo[] = []; for (const item of iPageRecords) { const vo: WeappVersionListVo = new WeappVersionListVo(); Object.assign(vo, item); @@ -118,7 +118,7 @@ export class WeappVersionServiceImplService { } else { try { const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId); - const qrcode: string = this.wxOpenMaService.getTestQrcode("", new HashMap()); + const qrcode: string = this.wxOpenMaService.getTestQrcode("", {}); if (fs.existsSync(qrcode)) { return "data:image/jpeg;base64," + Base64.getEncoder().encodeToString(FileUtils.readFileToByteArray(qrcode)); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-media-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-media-service-impl.service.ts index 9470e617..02b43dfa 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-media-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-media-service-impl.service.ts @@ -23,7 +23,7 @@ export class WechatMediaServiceImplService { if (CommonUtils.isNotEmpty(searchParam.type)) queryWrapper.eq("type", searchParam.type); [WechatMedia[], number] iPage = this.wechatMediaRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: WechatMediaListVo[] = new LinkedList(); + const list: WechatMediaListVo[] = []; for (const item of iPageRecords) { const vo: WechatMediaListVo = new WechatMediaListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-menu-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-menu-service-impl.service.ts index bd9836c1..64453723 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-menu-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-menu-service-impl.service.ts @@ -21,7 +21,7 @@ export class WechatMenuServiceImplService { */ async edit(...args: any[]): Promise { try{ - const params: Record = new HashMap(); + const params: Record = {}; params.put("button", data); WechatUtils.mp(this.requestContext.siteId).getMenuService().menuCreate(JsonUtils.parseObject(params).toString()) ; this.coreConfigService.setConfig(this.requestContext.siteId, "WECHAT_MENU", data); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-reply-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-reply-service-impl.service.ts index dddaad81..f6a4c41d 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-reply-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-reply-service-impl.service.ts @@ -26,7 +26,7 @@ export class WechatReplyServiceImplService { if (CommonUtils.isNotEmpty(path.basename(searchParam))) queryWrapper.like("name", path.basename(searchParam)); [WechatReply[], number] iPage = this.wechatReplyRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: WechatReplyListVo[] = new LinkedList(); + const list: WechatReplyListVo[] = []; for (const item of iPageRecords) { const vo: WechatReplyListVo = new WechatReplyListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-template-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-template-service-impl.service.ts index 128f4fce..3f4abf50 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-template-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-template-service-impl.service.ts @@ -16,7 +16,7 @@ export class WechatTemplateServiceImplService { const addonNoticeList: AddonNoticeListVo[] = this.coreNoticeService.getAddonList(this.requestContext.siteId); for (const item of addonNoticeList) { - const filter: NoticeInfoVo[] = new LinkedList(); + const filter: NoticeInfoVo[] = []; for (const noticeItem of item.getNotice()) { if (noticeItem.getSupport_type().indexOf("wechat") != -1) { filter.push(noticeItem); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-service-impl.service.ts index ef634eb9..55dcfd84 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-service-impl.service.ts @@ -90,7 +90,7 @@ export class OplatformServiceImplService { wrapper.orderByDesc(SysConfig::getUpdateTime); any /* TODO: Page */ pageObj = new Page<>(page, limit); [SysConfig[], number] iPage = this.sysConfigRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }); - const listInfo: OplatformRecordVo[] = new LinkedList(); + const listInfo: OplatformRecordVo[] = []; for (const item of iPageRecords) { const vo: OplatformRecordVo = new OplatformRecordVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/weapp-version-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/weapp-version-service-impl.service.ts index 56a075b4..26182b07 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/weapp-version-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/weapp-version-service-impl.service.ts @@ -283,7 +283,7 @@ export class WeappVersionServiceImplService { const limit: number = pageParam.limit; [SiteGroup[], number] iPage = this.siteGroupRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), /* TODO: any /* TODO: QueryWrapper */需改写为TypeORM的where条件对象 */.select("group_id,group_name")); - const list: SiteGroupWeappVersionVo[] = new LinkedList(); + const list: SiteGroupWeappVersionVo[] = []; for (const item of iPageRecords) { const vo: SiteGroupWeappVersionVo = new SiteGroupWeappVersionVo(); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-form-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-form-service-impl.service.ts index 7fe1891a..28856078 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-form-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-form-service-impl.service.ts @@ -26,7 +26,7 @@ export class DiyFormServiceImplService { .eq("site_id", this.requestContext.siteId); const formInfo: DiyForm = this.diyFormRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }); - List> error = new ArrayList(); + List> error = []; const info: DiyFormInfoVo = new DiyFormInfoVo(); if (formInfo != null) { BeanUtil.copyProperties(formInfo, info); @@ -70,7 +70,7 @@ export class DiyFormServiceImplService { } } } else { - const errorMap: Record = new HashMap(); + const errorMap: Record = {}; errorMap.put("title", "当前表单无法查看"); errorMap.put("type", "表单状态"); errorMap.put("desc", "该表单已关闭"); @@ -164,7 +164,7 @@ export class DiyFormServiceImplService { BeanUtil.copyProperties(diyFormRecords, vo); const list: DiyFormRecordsFields[] = this.diyFormRecordsFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); if (CommonUtils.isNotEmpty(list)) { - const volist: DiyFormRecordsFieldsListVo[] = new ArrayList(); + const volist: DiyFormRecordsFieldsListVo[] = []; for (const item of list) { const diyFormRecordsFieldsListVo: DiyFormRecordsFieldsListVo = new DiyFormRecordsFieldsListVo(); Object.assign(diyFormRecordsFieldsListVo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-service-impl.service.ts index 586c0c3c..bafb7dea 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-service-impl.service.ts @@ -114,7 +114,7 @@ export class DiyServiceImplService { const list: BottomConfigVo[] = this.coreDiyConfigService.getBottomList(); const site: SiteInfoVo = this.coreSiteService.getSiteCache(param.siteId()); - const tabbarList: BottomConfigVo[] = new LinkedList(); + const tabbarList: BottomConfigVo[] = []; for (const item of list) { if (item.key === "app" && list.length > 1 && site.getApps().size() == 1) continue; const config: BottomConfigVo = this.coreDiyConfigService.getBottomConfig(param.siteId(), item.key); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/login-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/login-service-impl.service.ts index 86f2833c..af4d85b2 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/login-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/login-service-impl.service.ts @@ -120,7 +120,7 @@ export class LoginServiceImplService { cache.setCode(String.format("%0" + 4 + "d", RandomUtil.randomInt(1, 9999))); cache.type = param.type; - const data: Record = new HashMap(); + const data: Record = {}; data.put("mobile", param.getMobile()); data.put("code", cache.getCode()); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-level-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-level-service-impl.service.ts index 9581bf79..8dbc7a4c 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-level-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-level-service-impl.service.ts @@ -47,7 +47,7 @@ export class MemberLevelServiceImplService { filling.put("benefits_three", new Record().set("title", "尊享客服").set("desc", "尊享客服").set("icon", "/static/resource/images/member/benefits/benefits_badge.png")); const index: number = 0; - const list: MemberLevelInfoVo[] = new LinkedList(); + const list: MemberLevelInfoVo[] = []; for (const level of memberLevelList) { const vo: MemberLevelInfoVo = new MemberLevelInfoVo(); Object.assign(vo, level); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-sign-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-sign-service-impl.service.ts index 229b5bbf..a27bb947 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-sign-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-sign-service-impl.service.ts @@ -96,7 +96,7 @@ export class MemberSignServiceImplService { this.memberSignRepository.save(model); // 发放日签奖励 - const dayAwardVar: Record = new HashMap(); + const dayAwardVar: Record = {}; dayAwardVar.put("from_type", "day_sign_award"); dayAwardVar.put("memo", "日签奖励"); this.coreMemberService.memberGiftGrant(param.siteId(), param.memberId(), config.getDayAward(), dayAwardVar); @@ -144,7 +144,7 @@ export class MemberSignServiceImplService { continueAward.remove("receive_limit"); continueAward.remove("receive_num"); - const continueAwardVar: Record = new HashMap(); + const continueAwardVar: Record = {}; continueAwardVar.put("from_type", "continue_sign_award"); continueAwardVar.put("memo", "连签奖励"); this.coreMemberService.memberGiftGrant(param.siteId(), param.memberId(), continueAward, continueAwardVar); @@ -165,8 +165,8 @@ export class MemberSignServiceImplService { */ async signMonthRecord(...args: any[]): Promise { const vo: MemberSignMonthRecordVo = new MemberSignMonthRecordVo(); - const days: number[] = new ArrayList(); - const period: MemberSignMonthRecordVo.Period[] = new ArrayList(); + const days: number[] = []; + const period: MemberSignMonthRecordVo.Period[] = []; const date: Date = DateUtil.parse(param.getYear() + "-" + param.getMonth() + "-1"); @@ -218,7 +218,7 @@ export class MemberSignServiceImplService { const award: Record = this.coreMemberService.getGiftContent(this.requestContext.siteId, item, "member_sign_continue"); - const content: string[] = new ArrayList(); + const content: string[] = []; const icon: string = ""; for (const key of award.keySet()) { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-area-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-area-service-impl.service.ts index ca4361c7..079c6cb5 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-area-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-area-service-impl.service.ts @@ -81,7 +81,7 @@ export class SysAreaServiceImplService { Map sysAreaMap = ObjectGroupUtils.groupList(sysAreaLevelVoList, "pid"); return assembleAreaTree(sysAreaLevelVoList, sysAreaMap, 1, 3); } - return new ArrayList(); + return []; } /** diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-verify-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-verify-service-impl.service.ts index b8929e56..d6649399 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-verify-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-verify-service-impl.service.ts @@ -16,7 +16,7 @@ export class SysVerifyServiceImplService { async getVerifyCode(...args: any[]): Promise { // 生成核销码(对应业务调用) const verifyCodeList: string[] = this.createVerifyCode(param.siteId(), param.memberId(), param.type, param.data); - const sysVerifyGetCodeVoList: SysVerifyGetCodeVo[] = new ArrayList(); + const sysVerifyGetCodeVoList: SysVerifyGetCodeVo[] = []; for (const verifyCode of verifyCodeList) { const sysVerifyGetCodeVo: SysVerifyGetCodeVo = new SysVerifyGetCodeVo(); sysVerifyGetCodeVo.setCode(verifyCode); @@ -187,7 +187,7 @@ export class SysVerifyServiceImplService { throw new Error("核销员不存在"); } // 核销操作 - const verifyDataMap: Record = new HashMap(); + const verifyDataMap: Record = {}; verifyDataMap.put("site_id", verifyMap.get("site_id")); verifyDataMap.put("code", param.getCode()); verifyDataMap.put("body", verifyMap.get("body")); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-cloud-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-cloud-service-impl.service.ts index 72055c8f..b452a6a3 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-cloud-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-cloud-service-impl.service.ts @@ -78,7 +78,7 @@ export class CoreAppCloudServiceImplService { actionQuery.put("data[product_key]", instance.getProductKey()); const actionToken: Record = this.niucloudService.getActionToken("appbuild", actionQuery); - Record = new HashMap(); + Record = {}; query.put("authorize_code", instance.getCode()); query.put("timestamp", taskKey); query.put("token", actionToken == null ? "" : actionToken.getStr("token")); @@ -105,7 +105,7 @@ export class CoreAppCloudServiceImplService { async getAppCompileLog(...args: any[]): Promise { const instance: NiucloudUtils = NiucloudUtils.getInstance(); - const query: Record = new HashMap(); + const query: Record = {}; query.put("authorize_code", instance.getCode()); query.put("timestamp", key); @@ -140,7 +140,7 @@ export class CoreAppCloudServiceImplService { * generateSignCert */ async generateSignCert(...args: any[]): Promise { - const query: Record = new HashMap(); + const query: Record = {}; query.put("key_alias", param.getKeyAlias()); query.put("key_password", param.getKeyPassword()); query.put("store_password", param.getStorePassword()); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy/impl/core-diy-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy/impl/core-diy-service-impl.service.ts index 10ed0adb..e73331dd 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy/impl/core-diy-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy/impl/core-diy-service-impl.service.ts @@ -34,7 +34,7 @@ export class CoreDiyServiceImplService { return; } - const diyThemes: DiyTheme[] = new ArrayList(); + const diyThemes: DiyTheme[] = []; // 处理主题配置 themeColorList.forEach(item => { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy_form/impl/core-diy-form-records-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy_form/impl/core-diy-form-records-service-impl.service.ts index cb655cd1..4598f33e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy_form/impl/core-diy-form-records-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/diy_form/impl/core-diy-form-records-service-impl.service.ts @@ -45,7 +45,7 @@ export class CoreDiyFormRecordsServiceImplService { Object.assign(memberVo, vo); vo.setMember(memberVo); if (CommonUtils.isNotEmpty(list)) { - const map: Record = new HashMap(); + const map: Record = {}; for (const item of list) { const diyFormRecordsFieldsListVo: DiyFormRecordsFieldsListVo = new DiyFormRecordsFieldsListVo(); Object.assign(diyFormRecordsFieldsListVo, item); @@ -71,7 +71,7 @@ export class CoreDiyFormRecordsServiceImplService { Object.assign(vo, model); const list: DiyFormRecordsFields[] = this.diyFormRecordsFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); if (CommonUtils.isNotEmpty(list)) { - const map: Record = new HashMap(); + const map: Record = {}; for (const item of list) { const diyFormRecordsFieldsListVo: DiyFormRecordsFieldsListVo = new DiyFormRecordsFieldsListVo(); Object.assign(diyFormRecordsFieldsListVo, item); @@ -97,14 +97,14 @@ export class CoreDiyFormRecordsServiceImplService { model.value = JSONUtil.toJsonStr(addParam.value); this.diyFormRecordsRepository.save(model); const list: DiyFormFields[] = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", addParam.siteId)); - const fieldList: Record = new HashMap(); + const fieldList: Record = {}; if (CommonUtils.isNotEmpty(list)) { for (const item of list) { fieldList.put(item.getFieldKey(), item); } } - const recordsFieldsList: DiyFormRecordsFields[] = new ArrayList(); + const recordsFieldsList: DiyFormRecordsFields[] = []; if (CommonUtils.isNotEmpty(addParam.value)) { const components: JSONArray = JSONUtil.parseArray(addParam.value); @@ -225,7 +225,7 @@ export class CoreDiyFormRecordsServiceImplService { .collect(/* Collectors已删除 */.toMap(DiyFormFields::getFieldKey, Function.identity())); // 处理字段数据 - const recordsFields: DiyFormRecordsFields[] = new ArrayList(); + const recordsFields: DiyFormRecordsFields[] = []; if (StringUtils.isNotEmptyArray(param.value)) { for (const comp of param.value) { if (!(comp instanceof Record)) continue; diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-cash-out-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-cash-out-service-impl.service.ts index 2a5de0ef..03a987cd 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-cash-out-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-cash-out-service-impl.service.ts @@ -112,7 +112,7 @@ export class CoreMemberCashOutServiceImplService { memberCashOutMapper.updateById(cashOut); } - const data: Record = new HashMap(); + const data: Record = {}; data.put("transfer_voucher", ObjectUtil.defaultIfEmpty(param.getTransferVoucher(), "")); data.put("transfer_remark", ObjectUtil.defaultIfEmpty(param.getTransferRemark(), "")); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-service-impl.service.ts index b130fe03..10d29e32 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/notice/impl/core-notice-service-impl.service.ts @@ -38,7 +38,7 @@ export class CoreNoticeServiceImplService { map.put(item.key, item); } } - Record = new HashMap(); + Record = {}; for (Map.Entry noticeMap : NoticeEnum.getNotice().entrySet()) { const vo: NoticeInfoVo = new NoticeInfoVo(); @@ -70,12 +70,12 @@ export class CoreNoticeServiceImplService { adminAddon.key = "system"; adminAddon.title = "系统"; addonList.push(0, adminAddon); - const noticeAddonList: AddonNoticeListVo[] = new ArrayList(); + const noticeAddonList: AddonNoticeListVo[] = []; for (const addon of addonList) { const noticeListVo: AddonNoticeListVo = new AddonNoticeListVo(); noticeListVo.key = addon.key; noticeListVo.title = addon.title; - noticeListVo.setNotice(new ArrayList()); + noticeListVo.setNotice([]); for (Map.Entry noticeMap : notice.entrySet()) { if (noticeListVo.key === noticeMap.getValue(.getAddon())) { noticeListVo.getNotice().add(noticeMap.value); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-channel-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-channel-service-impl.service.ts index 747ed6d3..5336b5c3 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-channel-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-channel-service-impl.service.ts @@ -33,7 +33,7 @@ export class CorePayChannelServiceImplService { * getAllowPayTypeByChannel */ async getAllowPayTypeByChannel(...args: any[]): Promise { - const list: PayTypeVo[] = new LinkedList(); + const list: PayTypeVo[] = []; const payChannelList: PayChannel[] = this.payChannelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) .eq("site_id", siteId) diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-event-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-event-service-impl.service.ts index 4c59a2b0..147ac43d 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-event-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-event-service-impl.service.ts @@ -20,7 +20,7 @@ export class CorePayEventServiceImplService { queryWrapper.orderByDesc("id"); [PayRefund[], number] iPage = this.payRefundRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - const list: PayRefundListVo[] = new LinkedList(); + const list: PayRefundListVo[] = []; for (const item of iPageRecords) { const vo: PayRefundListVo = new PayRefundListVo(); Object.assign(vo, item); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-service-impl.service.ts index 057bf9e8..9a39ee09 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/pay/impl/core-pay-service-impl.service.ts @@ -22,7 +22,7 @@ export class CorePayServiceImplService { const driver: BasePay = this.driver(param.siteId, param.getChannel(), param.type); - const json: Record = new HashMap(); + const json: Record = {}; json.put("openid", param.getOpenid()); pay.setJson(JSONUtil.toJsonStr(json)); this.payMapper.updateById(pay); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/schedule/impl/core-schedule-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/schedule/impl/core-schedule-service-impl.service.ts index a72b1ba8..fab031f6 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/schedule/impl/core-schedule-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/schedule/impl/core-schedule-service-impl.service.ts @@ -21,7 +21,7 @@ export class CoreScheduleServiceImplService { const scheduleList: SysSchedule[] = this.sysScheduleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).select("id,`key`")); const scheduleMap: Record = scheduleList.collect(/* Collectors已删除 */.toMap(SysSchedule::getKey, i => i)); - const list: SysSchedule[] = new LinkedList(); + const list: SysSchedule[] = []; for (const i of number = 0; i < schedule.length; i++) { const item: Record = schedule.getRecord(i); @@ -80,7 +80,7 @@ export class CoreScheduleServiceImplService { const scheduleList: SysSchedule[] = this.sysScheduleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).select("id,`key`")); const scheduleMap: Record = scheduleList.collect(/* Collectors已删除 */.toMap(SysSchedule::getKey, i => i)); - const list: SysSchedule[] = new LinkedList(); + const list: SysSchedule[] = []; for (const i of number = 0; i < schedule.length; i++) { const item: Record = schedule.getRecord(i); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-service-impl.service.ts index cc273c1c..318f5f9b 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/site/impl/core-site-service-impl.service.ts @@ -68,8 +68,8 @@ export class CoreSiteServiceImplService { siteInfoVo.setSiteAddons(this.addonService.getAddonListByKeys(siteInfoVo.getAddonKeys(), "")); siteInfoVo.setApps(this.addonService.getAddonListByKeys(siteInfoVo.getAddonKeys(), AddonActionEnum.APP.getCode())); }else{ - siteInfoVo.setSiteAddons(new ArrayList()); - siteInfoVo.setApps(new ArrayList()); + siteInfoVo.setSiteAddons([]); + siteInfoVo.setApps([]); } const sysUserRole: SysUserRole = this.sysUserRoleRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_id", siteId).eq("is_admin", 1)); if (CommonUtils.isNotEmpty(sysUserRole)) { @@ -128,7 +128,7 @@ export class CoreSiteServiceImplService { * siteInitBySiteId */ async siteInitBySiteId(...args: any[]): Promise { - const userIds: number[] = new ArrayList(); + const userIds: number[] = []; try { for (const table of tables) { if (!isTableExists(table)) { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-export-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-export-service-impl.service.ts index d8203777..e8662db7 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-export-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-export-service-impl.service.ts @@ -99,7 +99,7 @@ export class CoreExportServiceImplService { List datas = new ArrayList<>(CollectionUtil.size(valueData)); for (const itemObj of valueData) { const itemJsonObject: Record = (Record) itemObj; - const itemDatas: Object[] = new ArrayList(); + const itemDatas: Object[] = []; for (const itemKey of keyList) { itemDatas.push(itemJsonObject.getStr(itemKey, "")); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-storage-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-storage-service-impl.service.ts index b1031476..7a8ecc6f 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-storage-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/upload/impl/core-storage-service-impl.service.ts @@ -19,7 +19,7 @@ export class CoreStorageServiceImplService { const storageConfig: Record = getStorageConfig(siteId); const storageTypeList: Record = UploadLoader.type; - const coreStorAgeConfigVoList: CoreStorAgeConfigVo[] = new ArrayList(); + const coreStorAgeConfigVoList: CoreStorAgeConfigVo[] = []; for (const key of storageTypeList.keySet()) { const storageValues: Record = JsonUtils.parseObject(storageTypeList.get(key)); const coreStorAgeConfigVo: CoreStorAgeConfigVo = new CoreStorAgeConfigVo(); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-cloud-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-cloud-service-impl.service.ts index ee1f1b6b..a36a21df 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-cloud-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-cloud-service-impl.service.ts @@ -42,7 +42,7 @@ export class CoreWeappCloudServiceImplService { actionQuery.put("data[product_key]", instance.getProductKey()); const actionToken: Record = this.niucloudService.getActionToken("weappbuild", actionQuery); - Record = new HashMap(); + Record = {}; query.put("authorize_code", instance.getCode()); query.put("compile", compileAddon != null ? 1 : 0); query.put("appid", param.getAppId()); @@ -71,7 +71,7 @@ export class CoreWeappCloudServiceImplService { async getWeappCompileLog(...args: any[]): Promise { const instance: NiucloudUtils = NiucloudUtils.getInstance(); - const query: Record = new HashMap(); + const query: Record = {}; query.put("authorize_code", instance.getCode()); query.put("timestamp", key); @@ -91,7 +91,7 @@ export class CoreWeappCloudServiceImplService { try { const instance: NiucloudUtils = NiucloudUtils.getInstance(); - const query: Record = new HashMap(); + const query: Record = {}; query.put("authorize_code", instance.getCode()); const response: HttpResponse = new NiucloudUtils.Cloud().useThirdBuild().build("cloud/get_weapp_preview").query(query).execute(); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-delivery-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-delivery-service-impl.service.ts index dd2f4130..a53c4b5e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-delivery-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-delivery-service-impl.service.ts @@ -88,7 +88,7 @@ export class CoreWeappDeliveryServiceImplService { shippingInfo.setDeliveryMode(shippingData.getDeliveryMode()); // 处理发货列表 - const wxShippingList: ShippingListBean[] = new ArrayList(); + const wxShippingList: ShippingListBean[] = []; for (WeappUploadShippingParam.UploadShippingParam item : shippingData.getShippingList()) { const shipping: ShippingListBean = new ShippingListBean(); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-service-impl.service.ts index 8ba2c2f8..a90f24bc 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/weapp/impl/core-weapp-service-impl.service.ts @@ -14,7 +14,7 @@ export class CoreWeappServiceImplService { */ async qrcodeBytes(...args: any[]): Promise { try { - const scene: string[] = new LinkedList(); + const scene: string[] = []; for (const key of data.keySet()) { scene.push(key + "-" + data.get(key).toString()); } @@ -39,7 +39,7 @@ export class CoreWeappServiceImplService { */ async qrcodeFile(...args: any[]): Promise { try { - const scene: string[] = new LinkedList(); + const scene: string[] = []; for (const key of data.keySet()) { scene.push(key + "-" + data.get(key).toString()); }