From 2999dd48c0c8828d5b1509a099ab1babfe8279a6 Mon Sep 17 00:00:00 2001 From: wanwu Date: Wed, 29 Oct 2025 16:20:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=BC=BA=E9=9B=86=E5=90=88?= =?UTF-8?q?=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🎯 策略说明: 1. Java集合类 → TypeScript原生类型 - new LinkedList/ArrayList/List() → [] - new HashMap/TreeMap() → {} - new HashSet() → new Set() 2. 业务类构造函数 → 保留原样 - new AddonListVo() → 保持不变（TypeScript支持） - DTO/VO类会被迁移，构造函数有效 ✅ 修复内容: - 修复正则：支持无泛型参数的构造函数 如: new LinkedList() (之前只支持 new LinkedList<>()) - 新增HashMap/HashSet/TreeMap转换 --- .../converters/utils/collection.converter.js | 24 ++++++-- .../addon-develop-service-impl.service.ts | 6 +- .../impl/addon-log-service-impl.service.ts | 2 +- .../addon/impl/addon-service-impl.service.ts | 20 +++---- .../auth/impl/auth-service-impl.service.ts | 10 ++-- .../auth/impl/login-service-impl.service.ts | 2 +- .../impl/admin-app-service-impl.service.ts | 2 +- .../dict/impl/dict-service-impl.service.ts | 6 +- .../impl/diy-route-service-impl.service.ts | 2 +- .../diy/impl/diy-service-impl.service.ts | 20 +++---- .../impl/diy-theme-service-impl.service.ts | 22 ++++---- .../diy-form-records-service-impl.service.ts | 18 +++--- .../impl/diy-form-service-impl.service.ts | 32 +++++------ .../impl/generate-service-impl.service.ts | 22 ++++---- .../impl/auth-site-service-impl.service.ts | 18 +++--- .../member-account-service-impl.service.ts | 2 +- .../member-address-service-impl.service.ts | 4 +- .../impl/member-label-service-impl.service.ts | 8 +-- .../impl/member-level-service-impl.service.ts | 6 +- .../impl/member-service-impl.service.ts | 22 ++++---- .../impl/member-sign-service-impl.service.ts | 2 +- .../impl/cloud-build-service-impl.service.ts | 6 +- .../impl/niu-cloud-service-impl.service.ts | 20 +++---- .../impl/nui-sms-service-impl.service.ts | 56 +++++++++---------- .../impl/pay-channel-service-impl.service.ts | 4 +- .../impl/pay-refund-service-impl.service.ts | 2 +- .../pay/impl/pay-service-impl.service.ts | 4 +- .../impl/pay-transfer-service-impl.service.ts | 2 +- .../site-account-log-service-impl.service.ts | 2 +- .../impl/site-group-service-impl.service.ts | 24 ++++---- .../site/impl/site-service-impl.service.ts | 22 ++++---- .../impl/site-user-service-impl.service.ts | 8 +-- .../impl/stat-hour-service-impl.service.ts | 2 +- .../stat/impl/stat-service-impl.service.ts | 16 +++--- .../sys-agreement-service-impl.service.ts | 2 +- .../sys/impl/sys-area-service-impl.service.ts | 4 +- .../sys-attachment-service-impl.service.ts | 8 +-- ...sys-backup-records-service-impl.service.ts | 14 ++--- .../sys/impl/sys-menu-service-impl.service.ts | 28 +++++----- .../sys-notice-log-service-impl.service.ts | 4 +- .../impl/sys-notice-service-impl.service.ts | 2 +- ...sys-notice-sms-log-service-impl.service.ts | 4 +- .../impl/sys-poster-service-impl.service.ts | 8 +-- .../impl/sys-printer-service-impl.service.ts | 4 +- ...s-printer-template-service-impl.service.ts | 6 +- .../sys/impl/sys-role-service-impl.service.ts | 14 ++--- .../impl/sys-schedule-service-impl.service.ts | 16 +++--- ...ys-upgrade-records-service-impl.service.ts | 2 +- .../impl/sys-user-log-service-impl.service.ts | 2 +- .../sys/impl/sys-user-service-impl.service.ts | 26 ++++----- .../sys/impl/system-service-impl.service.ts | 2 +- .../impl/upgrade-service-impl.service.ts | 18 +++--- .../impl/verifier-service-impl.service.ts | 6 +- .../impl/verify-service-impl.service.ts | 4 +- .../weapp-template-service-impl.service.ts | 8 +-- .../weapp-version-service-impl.service.ts | 4 +- .../impl/wechat-media-service-impl.service.ts | 2 +- .../impl/wechat-menu-service-impl.service.ts | 2 +- .../impl/wechat-reply-service-impl.service.ts | 2 +- .../wechat-template-service-impl.service.ts | 8 +-- .../impl/oplatform-service-impl.service.ts | 2 +- .../weapp-version-service-impl.service.ts | 14 ++--- .../diy/impl/diy-form-service-impl.service.ts | 28 +++++----- .../api/diy/impl/diy-service-impl.service.ts | 4 +- .../login/impl/login-service-impl.service.ts | 2 +- .../member-address-service-impl.service.ts | 4 +- .../member-cash-out-service-impl.service.ts | 2 +- .../impl/member-level-service-impl.service.ts | 6 +- .../impl/member-sign-service-impl.service.ts | 16 +++--- .../api/pay/impl/pay-service-impl.service.ts | 4 +- .../sys/impl/sys-area-service-impl.service.ts | 20 +++---- .../impl/sys-verify-service-impl.service.ts | 16 +++--- .../weapp/impl/weapp-service-impl.service.ts | 2 +- ...core-addon-install-service-impl.service.ts | 4 +- .../impl/core-addon-service-impl.service.ts | 2 +- .../core-app-cloud-service-impl.service.ts | 8 +-- .../diy/impl/core-diy-service-impl.service.ts | 4 +- ...e-diy-form-records-service-impl.service.ts | 20 +++---- ...re-member-cash-out-service-impl.service.ts | 2 +- .../core-member-level-service-impl.service.ts | 4 +- .../impl/core-notice-service-impl.service.ts | 10 ++-- .../core-pay-channel-service-impl.service.ts | 4 +- .../core-pay-event-service-impl.service.ts | 2 +- .../pay/impl/core-pay-service-impl.service.ts | 6 +- .../impl/core-poster-service-impl.service.ts | 2 +- .../core-schedule-service-impl.service.ts | 14 ++--- .../impl/core-site-service-impl.service.ts | 4 +- .../impl/core-export-service-impl.service.ts | 10 ++-- .../impl/core-menu-service-impl.service.ts | 14 ++--- .../impl/core-printer-service-impl.service.ts | 4 +- .../impl/core-storage-service-impl.service.ts | 6 +- .../core-weapp-cloud-service-impl.service.ts | 8 +-- ...ore-weapp-delivery-service-impl.service.ts | 2 +- .../impl/core-weapp-service-impl.service.ts | 4 +- 94 files changed, 444 insertions(+), 428 deletions(-) diff --git a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/converters/utils/collection.converter.js b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/converters/utils/collection.converter.js index ff197e7f..9c54d269 100644 --- a/wwjcloud-nest-v1/tools/java-to-nestjs-migration/converters/utils/collection.converter.js +++ b/wwjcloud-nest-v1/tools/java-to-nestjs-migration/converters/utils/collection.converter.js @@ -103,11 +103,27 @@ class CollectionConverter { // LinkedList → T[] tsCode = tsCode.replace(/LinkedList<(\w+)>/g, '$1[]'); - // new ArrayList<>() → [] - tsCode = tsCode.replace(/new\s+ArrayList<>?\(\)/g, '[]'); + // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ + // 【集合构造函数】→ TypeScript字面量 + // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ - // new LinkedList<>() → [] - tsCode = tsCode.replace(/new\s+LinkedList<>?\(\)/g, '[]'); + // new ArrayList<>() / new ArrayList() → [] + tsCode = tsCode.replace(/new\s+ArrayList(?:<[^>]*>)?\(\)/g, '[]'); + + // new LinkedList<>() / new LinkedList() → [] + tsCode = tsCode.replace(/new\s+LinkedList(?:<[^>]*>)?\(\)/g, '[]'); + + // new List<>() / new List() → [] (虽然Java中List是接口，但代码中可能出现) + tsCode = tsCode.replace(/new\s+List(?:<[^>]*>)?\(\)/g, '[]'); + + // new HashSet<>() / new HashSet() → new Set() + tsCode = tsCode.replace(/new\s+HashSet(?:<[^>]*>)?\(\)/g, 'new Set()'); + + // new HashMap<>() / new HashMap() → {} + tsCode = tsCode.replace(/new\s+HashMap(?:<[^>]*>)?\(\)/g, '{}'); + + // new TreeMap<>() / new TreeMap() → {} + tsCode = tsCode.replace(/new\s+TreeMap(?:<[^>]*>)?\(\)/g, '{}'); // Arrays.asList(...) → [...] tsCode = tsCode.replace(/Arrays\.asList\(([^)]+)\)/g, '[$1]'); 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 7ac2253e..8af1e129 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,14 +15,14 @@ export class AddonDevelopServiceImplService { * list */ async list(...args: any[]): Promise { - AddonDevelopListVo[] list = new LinkedList(); + const list: AddonDevelopListVo[] = new LinkedList(); try { // 获取已安装的插件 - Record installAddonList = this.coreAddonService.getInstallAddonList(); + const installAddonList: Record = this.coreAddonService.getInstallAddonList(); // 获取本地所有的插件 - File[] localAddons = fs.readdirSync(this.appConfig.webRootDownAddon) + const localAddons: string[] = fs.readdirSync(this.appConfig.webRootDownAddon) .map(path => path.toFile()) .filter(file => fs.statSync(file).isDirectory()) ; 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 909e0eb5..49b62139 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); - AddonLogListVo[] list = new LinkedList(); + const list: AddonLogListVo[] = new LinkedList(); 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 9ea03558..2c60480a 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 @@ -17,13 +17,13 @@ export class AddonServiceImplService { async getLocalAddonList(...args: any[]): Promise { const vo: LocalAddonListVo = new LocalAddonListVo(); - Record list = new HashMap(); + const list: Record = new const installAddonList: Record<>(); // 获取已安装的插件 - Record installAddonList = this.this.CoreAddonService.getInstallAddonList(); + Record = this.this.CoreAddonService.getInstallAddonList(); try { - ModuleListVo[] moduleList = this.niucloudService.getModuleList(); + const moduleList: ModuleListVo[] = this.niucloudService.getModuleList(); for (const item of moduleList) { ModuleListVo.const app: App = item.getApp(); @@ -42,7 +42,7 @@ export class AddonServiceImplService { } // 获取本地所有的插件 - File[] localAddons = fs.readdirSync(this.appConfig.webRootDownAddon) + const localAddons: string[] = fs.readdirSync(this.appConfig.webRootDownAddon) .map(path => path.toFile()) .filter(file => fs.statSync(file).isDirectory()) ; @@ -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); - AddonListVo[] list = new LinkedList(); + const list: AddonListVo[] = new LinkedList(); for (const item of iPageRecords) { const vo: AddonListVo = new AddonListVo(); Object.assign(vo, item); @@ -187,8 +187,8 @@ export class AddonServiceImplService { const jsonKey: JSONArray = JSONUtil.parseArray(keys); const jsonArray: JSONArray = new JSONArray(); if(jsonKey.length>0){ - String[] keyList=jsonKey.toList(String.class); - Addon[] addonList=this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); + const keyList: string[] = jsonKey.toList(String.class); + const addonList: Addon[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); for (const addon of addonList) { jsonArray.put(addon.title); } @@ -219,13 +219,13 @@ export class AddonServiceImplService { async download(...args: any[]): Promise { const instance: NiucloudUtils = NiucloudUtils.getInstance(); - Record actionQuery = new HashMap(); + const actionQuery: Record = new const query: Record<>(); actionQuery.put("data[app_key]", addon); actionQuery.put("data[version]", version); actionQuery.put("data[product_key]", instance.getProductKey()); const actionToken: Record = this.niucloudService.getActionToken("download", actionQuery); - Record query = new HashMap(); + Record = new HashMap(); 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 { - Record params = new HashMap(); + const params: Record = new HashMap(); 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 3994541e..403a76f2 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 @@ -72,13 +72,13 @@ export class AuthServiceImplService { } Map allMenuList = this.sysMenuService.getAllApiList(RequestUtils.appType(), 100); - String[] menulist = allMenuList.get(method); + const menulist: string[] = allMenuList.get(method); const is_exists: number = menulist.indexOf(rule); //判断当前访问的接口是否收到权限的限制 if (is_exists < 0) { Map otherMenuList = this.sysMenuService.getAllApiList(RequestUtils.appType() === AppTypeEnum.path.basename(ADMIN) ? AppTypeEnum.path.basename(SITE) : AppTypeEnum.path.basename(ADMIN), 100); - String[] methodMenuList = otherMenuList.get(method); + const methodMenuList: string[] = otherMenuList.get(method); const is_method_exists: number = methodMenuList.indexOf(rule); if (is_method_exists > 0) { throw new UnauthorizedException("NO_PERMISSION", 400); @@ -111,7 +111,7 @@ export class AuthServiceImplService { const appType: string = RequestUtils.appType(); Map authApi = new HashMap(); const sysUserRoleInfoVo: SysUserRoleInfoVo = new SysUserRoleInfoVo(); - SysMenu[] menuList = new ArrayList(); + const menuList: SysMenu[] = new ArrayList(); if (isSuperAdmin()) { isAdmin = 1; } else { @@ -124,8 +124,8 @@ export class AuthServiceImplService { if (isAdmin > 0) { menuList = this.sysMenuService.getMenuListByCondition(appType, siteId, 1, 0, new ArrayList(), addon); } else { - String[] roleIdList = JSONUtil.toList(JSONUtil.parseArray(sysUserRoleInfoVo.getRoleIds()), String.class); - String[] menuKeyList = this.sysRoleService.getMenuIdsByRoleIds(siteId, roleIdList); + const roleIdList: string[] = JSONUtil.toList(JSONUtil.parseArray(sysUserRoleInfoVo.getRoleIds()), String.class); + const menuKeyList: string[] = this.sysRoleService.getMenuIdsByRoleIds(siteId, roleIdList); menuList = this.sysMenuService.getMenuListByCondition(appType, siteId, 100, 0, menuKeyList, addon); } 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 ae440c56..4fd3e0e2 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(); - number[] siteIds=new ArrayList(); + const siteIds: number[] = new ArrayList(); 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 9426c8ef..a47b904f 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 */ }); - AppVersionListVo[] list = new LinkedList(); + const list: AppVersionListVo[] = new LinkedList(); 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 43107d4c..ef65f73a 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); - DictListVo[] list = new LinkedList(); + const list: DictListVo[] = new LinkedList(); for (const item of iPageRecords) { const vo: DictListVo = new DictListVo(); Object.assign(vo, item); @@ -105,8 +105,8 @@ export class DictServiceImplService { queryWrapper.orderByDesc("id"); - SysDict[] voList = this.dictRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - DictListVo[] list = new LinkedList(); + const voList: SysDict[] = this.dictRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const list: DictListVo[] = new LinkedList(); 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 475b6bc9..e7d2dc53 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(); - DiyRouteListVo[] routerList = new LinkedList(); + const routerList: DiyRouteListVo[] = new LinkedList(); 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 a79fcb4e..2ad074f1 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); - DiyPageListVo[] list = new LinkedList(); + const list: DiyPageListVo[] = new LinkedList(); for (const item of iPageRecords) { const vo: DiyPageListVo = new DiyPageListVo(); Object.assign(vo, item); @@ -56,12 +56,12 @@ export class DiyServiceImplService { if (CommonUtils.isNotEmpty(searchParam.title)) queryWrapper.like("title", searchParam.title); if (CommonUtils.isNotEmpty(searchParam.getMode())) queryWrapper.eq("mode", searchParam.getMode()); if (CommonUtils.isNotEmpty(searchParam.type)) { - String[] type = Arrays.stream(searchParam.type); + const type: string[] = Arrays.stream(searchParam.type); queryWrapper.in("type", type); } - DiyPage[] pages = this.diyPageRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - DiyPageListVo[] list = new LinkedList(); + const pages: DiyPage[] = this.diyPageRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const list: DiyPageListVo[] = new LinkedList(); for (const item of pages) { const vo: DiyPageListVo = new DiyPageListVo(); @@ -180,7 +180,7 @@ export class DiyServiceImplService { ) .orderByDesc("update_time"); - DiyPage[] pageList = this.diyPageRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const pageList: DiyPage[] = this.diyPageRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); const newChildList: JSONArray = new JSONArray(); for (const diyPage of pageList) { const child: Record = new Record(); @@ -332,7 +332,7 @@ export class DiyServiceImplService { // 安全遍历顶层数据 Iterator categoryIterator = data.keySet().iterator(); - String[] categoryToRemove = new ArrayList(); + const categoryToRemove: string[] = new ArrayList(); while (categoryIterator.hasNext()) { const categoryKey: string = categoryIterator.next(); @@ -343,7 +343,7 @@ export class DiyServiceImplService { const sortMap: Record = new Record(); // 安全遍历组件列表 - String[] keysToRemove = new ArrayList(); + const keysToRemove: string[] = new ArrayList(); for (const componentKey of new ArrayList<>(componentList.keySet())) { const component: Record = componentList.getRecord(componentKey); const supportPage: JSONArray = component.getJSONArray("support_page"); @@ -459,7 +459,7 @@ export class DiyServiceImplService { const diyRouteSearchParam: DiyRouteSearchParam = new DiyRouteSearchParam(); diyRouteSearchParam.url = useTemplate.getStr("page"); - DiyRouteListVo[] otherPage = this.diyRouteService.list(diyRouteSearchParam); + const otherPage: DiyRouteListVo[] = this.diyRouteService.list(diyRouteSearchParam); if (otherPage.length > 0) { const route: DiyRouteListVo = otherPage.get(0); useTemplate.set("title", route.title); @@ -499,7 +499,7 @@ export class DiyServiceImplService { .orderByDesc("id"); [DiyPage[], number] iPage = this.diyPageRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - DiyPageListVo[] list = new LinkedList(); + const list: DiyPageListVo[] = new LinkedList(); 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); - DiyPageListVo[] list = new LinkedList(); + const list: DiyPageListVo[] = new LinkedList(); 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 1363e5ac..e702f606 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 @@ -15,8 +15,8 @@ export class DiyThemeServiceImplService { async getDiyTheme(...args: any[]): Promise { const siteId: number = this.requestContext.siteId; const siteCache: SiteInfoVo = this.coreSiteService.getSiteCache(siteId); - DiyTheme[] themeDataList = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("type", "app").eq("is_selected", 1)); - Record themeData = new HashMap(); + const themeDataList: DiyTheme[] = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("type", "app").eq("is_selected", 1)); + const themeData: Record = new HashMap(); if ((themeDataList && themeDataList.length > 0)){ themeData = themeDataList.collect(/* Collectors已删除 */.toMap(theme => theme.getAddon(), theme => theme)); } @@ -41,7 +41,7 @@ export class DiyThemeServiceImplService { appTheme.putOpt("app", appThemeObj); const data: Record = new Record(); - Addon[] appsAndAddons = siteCache.getApps(); + const appsAndAddons: Addon[] = siteCache.getApps(); appsAndAddons.addAll(siteCache.getSiteAddons()); for (const value of appsAndAddons) { const addonTheme: Record = this.coreDiyService.getDefaultThemeColor(value.key); @@ -92,8 +92,8 @@ export class DiyThemeServiceImplService { if (CommonUtils.isEmpty(diyTheme)) { throw new BadRequestException("主题色不存在"); } - Addon[] addonData = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); - DiyTheme[] addonSaveData = new ArrayList(); + const addonData: Addon[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); + const addonSaveData: DiyTheme[] = new ArrayList(); if(CommonUtils.isNotEmpty(addonData)){ for (const addon of addonData) { const saveData: DiyTheme = new DiyTheme(); @@ -131,8 +131,8 @@ export class DiyThemeServiceImplService { */ async getDefaultThemeColor(...args: any[]): Promise { const addon: string = data.getAddon(); - DiyTheme[] themeList = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("addon", addon)); - DiyThemeInfoVo[] voList = new ArrayList(); + const themeList: DiyTheme[] = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("addon", addon)); + const voList: DiyThemeInfoVo[] = new ArrayList(); for (const theme of themeList) { const vo: DiyThemeInfoVo = new DiyThemeInfoVo(); Object.assign(vo, theme); @@ -151,8 +151,8 @@ export class DiyThemeServiceImplService { */ async addDiyTheme(...args: any[]): Promise { const siteId: number = this.requestContext.siteId; - Addon[] addonData = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); - DiyTheme[] addonSaveData = new ArrayList(); + const addonData: Addon[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); + const addonSaveData: DiyTheme[] = new ArrayList(); if ((addonData && addonData.length > 0)) { for (const addon of addonData) { @@ -191,8 +191,8 @@ export class DiyThemeServiceImplService { if (CommonUtils.isEmpty(diyThemeInfo)) { throw new Error("主题色不存在"); } - DiyTheme[] addonData = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("title", diyThemeInfo.title)); - DiyTheme[] addonSaveData = new ArrayList(); + const addonData: DiyTheme[] = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("title", diyThemeInfo.title)); + const addonSaveData: DiyTheme[] = new ArrayList(); 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 8f6a9e3f..b101f94b 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 @@ -50,17 +50,17 @@ export class DiyFormRecordsServiceImplService { async getFieldStatList(...args: any[]): Promise { const diyFormRecordsFieldsSearchParam: DiyFormRecordsFieldsSearchParam = new DiyFormRecordsFieldsSearchParam(); diyFormRecordsFieldsSearchParam.setFormId(searchParam.formId); - DiyFormFieldsListVo[] fieldsList = this.diyFormService.getFieldsList(diyFormRecordsFieldsSearchParam); + const fieldsList: DiyFormFieldsListVo[] = this.diyFormService.getFieldsList(diyFormRecordsFieldsSearchParam); // 过滤简单字段列表 const simpleTypes: string[] = {"FormRadio", "FormCheckbox", "FormDateScope", "FormTimeScope", "FormImage"}; - DiyFormFieldsListVo[] simpleFieldList = fieldsList + const simpleFieldList: DiyFormFieldsListVo[] = fieldsList .filter(e => ![simpleTypes].includes(e.getFieldType())) ; // 过滤 JSON 字段列表 const jsonTypes: string[] = {"FormRadio", "FormCheckbox", "FormDateScope", "FormTimeScope"}; - DiyFormFieldsListVo[] jsonFieldList = fieldsList + const jsonFieldList: DiyFormFieldsListVo[] = fieldsList .filter(e => [jsonTypes].includes(e.getFieldType())) ; @@ -78,7 +78,7 @@ export class DiyFormRecordsServiceImplService { .select("form_id, field_key, field_type, field_value, count(*) as write_count") .groupBy("field_value")); for (const i of number = 0; i < valueList.length; i++) { - Record value = valueList.get(i); + const value: Record = valueList.get(i); const diyFormComponentEnum: DiyFormComponentEnum = new DiyFormComponentEnum(); const component: Record = diyFormComponentEnum.getComponent(value.get("field_type").toString()); if(component.containsKey("render")){ @@ -108,7 +108,7 @@ export class DiyFormRecordsServiceImplService { if (totalCount > 0) { const totalPercent: number = 100; for (const i of number = 0; i < valueList.length; i++) { - Record value = valueList.get(i); + const value: Record = valueList.get(i); double itemPercent; if (i == valueList.length - 1) { itemPercent = totalPercent; @@ -134,7 +134,7 @@ export class DiyFormRecordsServiceImplService { } List> fieldList = diyFormRecordsFieldsMapper.selectMaps(fieldQueryWrapper); for (const i of number = 0; i < fieldList.length; i++) { - Record value = fieldList.get(i); + const value: Record = fieldList.get(i); const diyFormComponentEnum: DiyFormComponentEnum = new DiyFormComponentEnum(); const component: Record = diyFormComponentEnum.getComponent(value.get("field_type").toString()); if(component.containsKey("render")){ @@ -176,7 +176,7 @@ export class DiyFormRecordsServiceImplService { valueMap.get(key).put("write_count", valueMap.get(key).get("write_count") + 1); totalCount++; } else { - Record newRecord = new HashMap<>(record); + const newRecord: Record = new HashMap<>(record); newRecord.put("render_value", value); newRecord.put("write_count", 1); valueMap.put(key, newRecord); @@ -190,7 +190,7 @@ export class DiyFormRecordsServiceImplService { List> valueList = new ArrayList<>(valueMap.values()); const totalPercent: number = 100; for (const i of number = 0; i < valueList.length; i++) { - Record value = valueList.get(i); + const value: Record = valueList.get(i); double itemPercent; if (i == valueList.length - 1) { itemPercent = totalPercent; @@ -205,7 +205,7 @@ export class DiyFormRecordsServiceImplService { } // 合并结果 - DiyFormFieldsListVo[] resultList = new ArrayList(); + const resultList: DiyFormFieldsListVo[] = new ArrayList(); 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 2f51c9c0..9c33c5a8 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); - DiyFormListVo[] list = new LinkedList(); + const list: DiyFormListVo[] = new LinkedList(); for (const item of iPageRecords) { const vo: DiyFormListVo = new DiyFormListVo(); Object.assign(vo, item); @@ -75,8 +75,8 @@ export class DiyFormServiceImplService { queryWrapper.eq("status", searchParam.status); } queryWrapper.orderByDesc("form_id"); - DiyForm[] list = this.diyFormRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - DiyFormListVo[] voList = new LinkedList(); + const list: DiyForm[] = this.diyFormRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const voList: DiyFormListVo[] = new LinkedList(); 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); - DiyFormFields[] diyFormFields = new ArrayList(); + const diyFormFields: DiyFormFields[] = new ArrayList(); if (CommonUtils.isNotEmpty(addParam.value)) { const value: Record = JsonUtils.parseObject(addParam.value); const components: JSONArray = value.getJSONArray("value"); @@ -219,10 +219,10 @@ export class DiyFormServiceImplService { model.value = editParam.value; model.updateTime = Date.now( / 1000); diyFormMapper.updateById(model); - DiyFormFields[] formFieldsList = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); - Record formFieldsListMap = formFieldsList.collect(/* Collectors已删除 */.toMap(DiyFormFields::getFieldKey, a => a)); - String[] existFieldKeys = new ArrayList(); - DiyFormFields[] diyFormFields = new ArrayList(); + 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(); if (CommonUtils.isNotEmpty(editParam.value)) { const value: Record = JsonUtils.parseObject(editParam.value); const components: JSONArray = value.getJSONArray("value"); @@ -296,7 +296,7 @@ export class DiyFormServiceImplService { for (const formId of formIds) { event.setFormId(formId); event.siteId = this.requestContext.siteId; - List result = EventAndSubscribeOfPublisher.publishAndCallback(event); + const result: DiyFormDelBeforeEventDefiner.DiyFromDelBeforeResult[] = EventAndSubscribeOfPublisher.publishAndCallback(event); for (DiyFormDelBeforeEventDefiner.DiyFromDelBeforeResult res : result) { if(CommonUtils.isNotEmpty(res)) { @@ -421,7 +421,7 @@ export class DiyFormServiceImplService { if(CommonUtils.isEmpty(diyForm)) throw new BadRequestException("万能表单不存在"); const diyFormSubmitConfig: DiyFormSubmitConfig = this.diyFormSubmitConfigRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })); const diyFormWriteConfig: DiyFormWriteConfig = this.diyFormWriteConfigRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })); - DiyFormFields[] diyFormFields = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); + const diyFormFields: DiyFormFields[] = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); // 复制表单信息 const newDiyForm: DiyForm = new DiyForm(); @@ -441,7 +441,7 @@ export class DiyFormServiceImplService { // 复制表单字段 if (!CommonUtils.isEmpty(diyFormFields)) { - DiyFormFields[] newFormFieldList = new ArrayList(); + const newFormFieldList: DiyFormFields[] = new ArrayList(); for (const item of diyFormFields) { const newField: DiyFormFields = new DiyFormFields(); Object.assign(newField, item); @@ -565,8 +565,8 @@ export class DiyFormServiceImplService { }else { queryWrapper.orderByDesc(diyFormRecordsFieldsSearchParam.getOrder()); } - DiyFormFields[] list = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - DiyFormFieldsListVo[] listVo = new LinkedList(); + const list: DiyFormFields[] = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const listVo: DiyFormFieldsListVo[] = new LinkedList(); for (const item of list) { const vo: DiyFormFieldsListVo = new DiyFormFieldsListVo(); Object.assign(vo, item); @@ -582,10 +582,10 @@ export class DiyFormServiceImplService { const page: number = pageParam.page; const limit: number = pageParam.limit; // 验证表单ID集合 - number[] verifyFormIds = new ArrayList(); + const verifyFormIds: number[] = new ArrayList(); if (param.getVerifyFormIds() != null && !param.getVerifyFormIds().isEmpty()) { // 查询存在的表单ID - DiyForm[] existForms = this.diyFormRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) + const existForms: DiyForm[] = this.diyFormRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) .in("form_id", param.getVerifyFormIds()) ); @@ -617,7 +617,7 @@ export class DiyFormServiceImplService { if (formPageTotal == 0){ return PageResult.build(page, limit, 0, new ArrayList()); } - DiyFormInfoVo[] resultList = new ArrayList(); + const resultList: DiyFormInfoVo[] = new ArrayList(); 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 77a93995..2fd128c4 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 @@ -67,9 +67,9 @@ export class GenerateServiceImplService { vo.setDeleteColumnName(""); vo.setIsDelete(0); } - GenerateColumn[] columnList = this.generateColumnRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); + const columnList: GenerateColumn[] = this.generateColumnRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); if (CommonUtils.isNotEmpty(columnList)) { - GenerateColumnVo[] columnVoList = new ArrayList(); + const columnVoList: GenerateColumnVo[] = new ArrayList(); for (const column of columnList) { const generateColumnVo: GenerateColumnVo = new GenerateColumnVo(); Object.assign(generateColumnVo, column); @@ -147,7 +147,7 @@ export class GenerateServiceImplService { } List> listData = jdbcTemplate.queryForList(sql); if (CommonUtils.isEmpty(listData)) throw new AdminException("数据表不存在"); - Record table = listData.get(0); + const table: Record = listData.get(0); if (CommonUtils.isEmpty(table)) throw new AdminException("数据表不存在"); const tableName: string = table.get("Name").toString().substring(tablePrefix.length()); @@ -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; - GenerateColumn[] list = new ArrayList(); + const list: GenerateColumn[] = new ArrayList(); 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()); - GenerateColumn[] list = new ArrayList(); + const list: GenerateColumn[] = new ArrayList(); for (const i of number = 0; i < columns.length; i++) { const generateColumn: GenerateColumn = new GenerateColumn(); @@ -309,9 +309,9 @@ export class GenerateServiceImplService { */ async generate(...args: any[]): Promise { const generateTable: GenerateTable = generateTableMapper.selectById(generateCodeParam.id); - GenerateColumn[] columnList = this.generateColumnRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); + const columnList: GenerateColumn[] = this.generateColumnRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); const coreGenerateService: CoreGenerateService = new CoreGenerateService(); - CoreGenerateTemplateVo[] list = this.coreGenerateService.generateCode(generateTable, columnList); + const list: CoreGenerateTemplateVo[] = this.coreGenerateService.generateCode(generateTable, columnList); // 下载 if (generateCodeParam.getGenerateType() === "2") { @@ -343,10 +343,10 @@ export class GenerateServiceImplService { */ async preview(...args: any[]): Promise { const generateTable: GenerateTable = generateTableMapper.selectById(id); - GenerateColumn[] list = this.generateColumnRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); + const list: GenerateColumn[] = this.generateColumnRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); const coreGenerateService: CoreGenerateService = new CoreGenerateService(); - CoreGenerateTemplateVo[] columnList = this.coreGenerateService.generateCode(generateTable, list); - GeneratePreviewVo[] voList = new ArrayList(); + const columnList: CoreGenerateTemplateVo[] = this.coreGenerateService.generateCode(generateTable, list); + const voList: GeneratePreviewVo[] = new ArrayList(); for (const coreGenerateTemplateVo of columnList) { const vo: GeneratePreviewVo = new GeneratePreviewVo(); vo.name = coreGenerateTemplateVo.getFileName(); @@ -363,7 +363,7 @@ export class GenerateServiceImplService { */ async getDbFieldType(...args: any[]): Promise { type = getDbType(type); - Map map = SqlColumnEnum.getMap(); + const map: Record = SqlColumnEnum.getMap(); const field: string = ""; for (Map.Entry entry : map.entrySet()) { if ([entry.getValue(]).includes(type)) { 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 7e407df6..9f730702 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 @@ -39,7 +39,7 @@ export class AuthSiteServiceImplService { } queryWrapper.ne("app_type", "admin"); - number[] siteIds = getSiteIds(); + const siteIds: number[] = getSiteIds(); if(!this.authService.isSuperAdmin()) { if (CommonUtils.isNotEmpty(siteIds)) { queryWrapper.in("site_id", siteIds); @@ -91,7 +91,7 @@ export class AuthSiteServiceImplService { } [Site[], number] iPage = this.siteRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - SiteListVo[] list = new LinkedList(); + const list: SiteListVo[] = new LinkedList(); for (const item of iPageRecords) { const vo: SiteListVo = new SiteListVo(); Object.assign(vo, item); @@ -282,8 +282,8 @@ export class AuthSiteServiceImplService { async getSiteIds(...args: any[]): Promise { MPJany /* TODO: QueryWrapper */ queryWrapper = new MPJany /* TODO: QueryWrapper */(); queryWrapper.select("site_id").eq("uid", RequestUtils.uid()).ne("site_id", RequestUtils.defaultSiteId()).eq("status", 1); - SysUserRole[] sysUserRoleList=this.sysUserRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - number[] siteIds=new ArrayList(); + const sysUserRoleList: SysUserRole[] = this.sysUserRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const siteIds: number[] = new ArrayList(); for (const sysUserRole of sysUserRoleList) { siteIds.push(sysUserRole.siteId); } @@ -294,9 +294,9 @@ export class AuthSiteServiceImplService { * getSiteGroup */ async getSiteGroup(...args: any[]): Promise { - UserCreateSiteVo[] userCreateSiteVoList=new ArrayList(); + const userCreateSiteVoList: UserCreateSiteVo[] = new ArrayList(); if(this.authService.isSuperAdmin()){ - SiteGroup[] siteGroupList=this.siteGroupRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const siteGroupList: SiteGroup[] = this.siteGroupRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); for (const siteGroup of siteGroupList) { const userCreateSiteVo: UserCreateSiteVo = new UserCreateSiteVo(); userCreateSiteVo.setGroupId(siteGroup.getGroupId()); @@ -310,7 +310,7 @@ export class AuthSiteServiceImplService { }else{ any /* TODO: QueryWrapper */ userCreateSiteLimitQueryWrapper=new QueryWrapper(); userCreateSiteLimitQueryWrapper.eq("uid", RequestUtils.uid()); - UserCreateSiteLimit[] userCreateSiteLimitList=this.userCreateSiteLimitRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const userCreateSiteLimitList: UserCreateSiteLimit[] = this.userCreateSiteLimitRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); for (const userCreateSiteLimit of userCreateSiteLimitList) { const userCreateSiteVo: UserCreateSiteVo = new UserCreateSiteVo(); BeanUtil.copyProperties(userCreateSiteLimit, userCreateSiteVo); @@ -352,11 +352,11 @@ export class AuthSiteServiceImplService { * getSiteGroupAppList */ async getSiteGroupAppList(...args: any[]): Promise { - String[] siteGroupAppList = getSiteGroupApps(); + const siteGroupAppList: string[] = getSiteGroupApps(); if (CollectionUtils.isEmpty(siteGroupAppList)){ return List.of(); } - Addon[] addonList = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) + const addonList: Addon[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) .eq(Addon::getStatus, AddonStatusEnum.ON.getCode()) .eq(Addon::getType, AddonActionEnum.APP.getCode()) .in(Addon::getKey, siteGroupAppList)); 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 2557afe8..54e2edfc 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); - MemberAccountLogListVo[] list = new LinkedList(); + const list: MemberAccountLogListVo[] = new LinkedList(); 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 37a26783..69c3547c 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 @@ -18,8 +18,8 @@ export class MemberAddressServiceImplService { queryWrapper.eq("site_id", this.requestContext.siteId); if (CommonUtils.isNotEmpty(searchParam.memberId)) queryWrapper.eq("member_id", searchParam.memberId); - MemberAddress[] records = this.memberAddressRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - MemberAddressListVo[] list = new LinkedList(); + const records: MemberAddress[] = this.memberAddressRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const list: MemberAddressListVo[] = new LinkedList(); 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 f26d409d..eed48e52 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); - MemberLabelListVo[] list = new LinkedList(); + const list: MemberLabelListVo[] = new LinkedList(); for (const item of iPageRecords) { const vo: MemberLabelListVo = new MemberLabelListVo(); const labelId: number = item.getLabelId(); @@ -34,7 +34,7 @@ export class MemberLabelServiceImplService { const canshu: string = String(labelId); //添加如果是空值判断 wrapper.apply("JSON_VALID(member_label) = 1 AND JSON_SEARCH(member_label, 'one', {0}) IS NOT NULL",canshu); - Member[] members = this.memberRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const members: Member[] = this.memberRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); Object.assign(vo, item); vo.setMemberNum(members.length); list.push(vo); @@ -116,9 +116,9 @@ export class MemberLabelServiceImplService { MPJany /* TODO: QueryWrapper */ queryWrapper = new MPJany /* TODO: QueryWrapper */(); queryWrapper.select("label_id,label_name").eq("site_id", siteId); - MemberLabel[] labels = this.memberLabelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); // 调用 selectList 方法 + const labels: MemberLabel[] = this.memberLabelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); // 调用 selectList 方法 - MemberLabelAllListVo[] list = new LinkedList(); + const list: MemberLabelAllListVo[] = new LinkedList(); 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 9738a53c..f879f421 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); - MemberLevelListVo[] list = new LinkedList(); + const list: MemberLevelListVo[] = new LinkedList(); for (const item of iPageRecords) { const vo: MemberLevelListVo = new MemberLevelListVo(); Object.assign(vo, item); @@ -118,9 +118,9 @@ export class MemberLevelServiceImplService { MPJany /* TODO: QueryWrapper */ queryWrapper = new MPJany /* TODO: QueryWrapper */(); queryWrapper.select("level_id,level_name, growth,site_id,level_benefits,level_gifts").eq("site_id", siteId); - MemberLevel[] labels = this.memberLevelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); // 调用 selectList 方法 + const labels: MemberLevel[] = this.memberLevelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); // 调用 selectList 方法 - MemberLevelAllListVo[] list = new LinkedList(); + const list: MemberLevelAllListVo[] = new LinkedList(); 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 3adb401e..40542689 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; - Member[] memberList = new ArrayList(); + const memberList: Member[] = new ArrayList(); if (page > 0 && limit > 0) { iPage = this.memberRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); memberList = iPageRecords; @@ -59,13 +59,13 @@ export class MemberServiceImplService { memberList = this.memberRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); } - Record levelMap = Collections.emptyMap(); - Set levelIds = CollStreamUtil.toSet(memberList, Member::getMemberLevel); + const levelMap: Record = Collections.emptyMap(); + const levelIds: number[] = CollStreamUtil.toSet(memberList, Member::getMemberLevel); if (CommonUtils.isNotEmpty(levelIds)) { levelMap = memberLevelMapper.selectBatchIds(levelIds).stream().collect(/* Collectors已删除 */.toMap(MemberLevel::getLevelId, e => e)); } - MemberListVo[] list = new LinkedList(); + const list: MemberListVo[] = new LinkedList(); for (const item of memberList) { const vo: MemberListVo = new MemberListVo(); Object.assign(vo, item); @@ -77,8 +77,8 @@ export class MemberServiceImplService { if (!item.getMemberLabel().isEmpty()) { const memberLabelArrays: JSONArray = JSONUtil.parseArray(vo.getMemberLabel()); if (memberLabelArrays != null && memberLabelArrays.length > 0) { - MemberLabelAllListVo[] memberLabelArray = new LinkedList(); - MemberLabel[] labelList = this.memberLabelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).in("label_id", memberLabelArrays)); + const memberLabelArray: MemberLabelAllListVo[] = new LinkedList(); + const labelList: MemberLabel[] = this.memberLabelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).in("label_id", memberLabelArrays)); for (const labelItem of labelList) { const labelVo: MemberLabelAllListVo = new MemberLabelAllListVo(); Object.assign(labelVo, labelItem); @@ -117,8 +117,8 @@ export class MemberServiceImplService { if (StrUtil.isNotEmpty(model.getMemberLabel()) && ![model.getMemberLabel(]).isEmpty()) { const memberLabelArrays: JSONArray = JSONUtil.parseArray(vo.getMemberLabel()); if (memberLabelArrays != null && memberLabelArrays.length > 0) { - MemberLabelAllListVo[] memberLabelArray = new LinkedList(); - MemberLabel[] labelList = this.memberLabelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).in("label_id", memberLabelArrays)); + const memberLabelArray: MemberLabelAllListVo[] = new LinkedList(); + const labelList: MemberLabel[] = this.memberLabelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).in("label_id", memberLabelArrays)); for (const item of labelList) { const labelVo: MemberLabelAllListVo = new MemberLabelAllListVo(); Object.assign(labelVo, item); @@ -281,9 +281,9 @@ export class MemberServiceImplService { if (CommonUtils.isNotEmpty(searchParam.keyword)) queryWrapper.like("member_no|username|nickname|mobile", searchParam.keyword); - Member[] members = this.memberRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); // 调用 selectList 方法 + const members: Member[] = this.memberRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); // 调用 selectList 方法 - MemberAllListVo[] list = new LinkedList(); + const list: MemberAllListVo[] = new LinkedList(); for (const item of members) { const vo: MemberAllListVo = new MemberAllListVo(); Object.assign(vo, item); @@ -336,7 +336,7 @@ export class MemberServiceImplService { return; } const field: string = param.getField(); - number[] memberIds = param.getMemberIds(); + const memberIds: number[] = param.getMemberIds(); const isAll: number = param.getIsAll(); if (!"member_label".equals(field) && !"member_level".equals(field)){ throw new BadRequestException("不支持的字段:" + field); 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 63e0aea6..1dd07051 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); - MemberSignListVo[] list = new LinkedList(); + const list: MemberSignListVo[] = new LinkedList(); 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 edb6f245..975423aa 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 @@ -54,11 +54,11 @@ export class CloudBuildServiceImplService { const instance: NiucloudUtils = NiucloudUtils.getInstance(); - Record actionQuery = new HashMap(); + const actionQuery: Record = new const query: Record<>(); actionQuery.put("data[product_key]", instance.getProductKey()); const actionToken: Record = this.niucloudService.getActionToken("cloudbuild", actionQuery); - Record query = new HashMap(); + Record = new HashMap(); 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(); - Record query = new HashMap(); + const query: Record = new HashMap(); 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 c5d068a1..2c43515b 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(); - Record query = new HashMap(); + const query: Record = new HashMap(); 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(); - Record query = new HashMap(); + const query: Record = new HashMap(); query.put("product_key", instance.getProductKey()); const data: JSONArray = NiucloudUtils.Niucloud.get("store/framework/version", query).getJSONArray("data"); if (data == null) return null; - FrameworkVersionListVo[] list = new LinkedList(); + const list: FrameworkVersionListVo[] = new LinkedList(); 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(); - Record query = new HashMap(); + const query: Record = new HashMap(); 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(); - Record query = new HashMap(); + const query: Record = new HashMap(); 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(); - Record query = new HashMap(); + const query: Record = new HashMap(); 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; - ModuleListVo[] list = new LinkedList(); + const list: ModuleListVo[] = new LinkedList(); 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(); - Record query = new HashMap(); + const query: Record = new HashMap(); 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(); - Record query = new HashMap(); + const query: Record = new HashMap(); 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()); - AppVersionListVo[] list = new LinkedList(); + const list: AppVersionListVo[] = new LinkedList(); 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 444cc750..1843a9ab 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 @@ -30,7 +30,7 @@ export class NuiSmsServiceImplService { * sendMobileCode */ async sendMobileCode(...args: any[]): Promise { - Record body = new HashMap(); + const body: Record = new HashMap(); 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()); - Record body = new HashMap(); + const body: Record = new HashMap(); body.put("username", param.getUsername()); body.put("password", param.getPassword()); try { @@ -101,7 +101,7 @@ export class NuiSmsServiceImplService { // 拆分手机号并验证 const mobiles: string = String(data.getOrDefault("mobiles", "")); - String[] mobileList = [mobiles.split(","]); + const mobileList: string[] = [mobiles.split(","]); if (!mobileList.includes(param.getMobile())) { throw new AdminException("手机号错误"); } @@ -110,7 +110,7 @@ export class NuiSmsServiceImplService { const newPassword: string = null; try { const resetPasswordUrl: string = String.format(RESET_PASSWORD_URL, param.getUsername()); - Record resetPasswordBody = new HashMap(); + const resetPasswordBody: Record = new HashMap(); resetPasswordBody.put("mobile", param.getMobile()); resetPasswordBody.put("code", param.getCode()); resetPasswordBody.put("key", param.key); @@ -164,12 +164,12 @@ export class NuiSmsServiceImplService { if (CommonUtils.isEmpty(config) || !config.getOrDefault("username", "").equals(username)) { throw new ApiException("牛云短信账号异常,请重新登录账号"); } - SysNotice[] list = this.sysNoticeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); - Record map = new HashMap(); + const list: SysNotice[] = this.sysNoticeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); + const map: Record = new HashMap(); if (!CollectionUtils.isEmpty(list)) { map = list.collect(/* Collectors已删除 */.toMap(SysNotice::getKey, item => item)); } - TemplateListVo[] notice = new ArrayList(); + const notice: TemplateListVo[] = new ArrayList(); for (Map.Entry noticeMap : NoticeEnum.getNiuyunNotice().entrySet()) { const noticeInfoVo: TemplateListVo = new TemplateListVo(); BeanUtil.copyProperties(noticeMap.value, noticeInfoVo); @@ -193,18 +193,18 @@ export class NuiSmsServiceImplService { notice.push(noticeInfoVo); } - NiuSmsTemplate[] niuSmsTemplates = this.niuSmsTemplateRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) + const niuSmsTemplates: NiuSmsTemplate[] = this.niuSmsTemplateRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) .eq("username", username) .eq("site_id", siteId)); - Record templateMap = new HashMap(); + const templateMap: Record = new HashMap(); if (!CollectionUtils.isEmpty(niuSmsTemplates)){ templateMap = niuSmsTemplates.collect(/* Collectors已删除 */.toMap(NiuSmsTemplate::getTemplateKey, item => item)); } - Addon[] addonList = this.coreSiteService.getSiteAddons(siteId); + const addonList: Addon[] = this.coreSiteService.getSiteAddons(siteId); const sys: Addon = new Addon(); sys.key = "system"; addonList.push(0, sys); - TemplateListVo[] result = new ArrayList(); + const result: TemplateListVo[] = new ArrayList(); 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()); - String[] paramsJson = new ArrayList(); + const paramsJson: string[] = new ArrayList(); 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); - String[] variable = new ArrayList(); + const variable: string[] = new ArrayList(); 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 { - Record orderListParam = new HashMap(); + const orderListParam: Record = new HashMap(); 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); - Record accountSendParam = new HashMap(); + const accountSendParam: Record = new HashMap(); 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); - Record editAccountBody = new HashMap(); + const editAccountBody: Record = new HashMap(); editAccountBody.put("new_mobile", param.getNewMobile()); editAccountBody.put("mobile", param.getMobile()); editAccountBody.put("code", param.getCode()); @@ -369,10 +369,10 @@ export class NuiSmsServiceImplService { const config: Record = getConfig(false); param.setPassword(config.getStr("password")); try { - Object[] failList = delSign(username, param); + const failList: Object[] = delSign(username, param); const configSignature: string = config.getStr("signature"); - String[] signatures = param.getSignatures(); + const signatures: string[] = param.getSignatures(); if (signatures != null && (failList && failList.length > 0) && signatures.includes(configSignature) && @@ -414,7 +414,7 @@ export class NuiSmsServiceImplService { * getSmsPackageList */ async getSmsPackageList(...args: any[]): Promise { - Record pageListParam = new HashMap(); + const pageListParam: Record = new HashMap(); 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); - Record orderCalculateBody = new HashMap(); + const orderCalculateBody: Record = new HashMap(); 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); - Record orderCreateBody = new HashMap(); + const orderCreateBody: Record = new HashMap(); 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); - Record payInfoBody = new HashMap(); + const payInfoBody: Record = new HashMap(); payInfoBody.put("notify_url", payInfoUrl); payInfoBody.put("return_url", returnUrl); payInfoBody.put("out_trade_no", outTradeNo); @@ -544,7 +544,7 @@ export class NuiSmsServiceImplService { */ async templateCreate(...args: any[]): Promise { const templateKey: string = param.getTemplateKey(); - TemplateListVo[] templateList = getTemplateList(smsType, username); + const templateList: TemplateListVo[] = getTemplateList(smsType, username); // 查找模版信息，如果不存在则抛出异常 const templateInfo: TemplateListVo = templateList @@ -558,7 +558,7 @@ export class NuiSmsServiceImplService { } // 检查模版是否已经审核通过，如果已通过则抛出异常 - NiuSmsTemplate[] modelInfo = this.niuSmsTemplateRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) + const modelInfo: NiuSmsTemplate[] = this.niuSmsTemplateRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) .eq("site_id", this.requestContext.siteId) .eq("username", username)); if (!CollectionUtils.isEmpty(modelInfo) && TemplateAuditStatus.TEMPLATE_PASS.getCode().toString() === modelInfo.get(0.getAuditStatus())) { @@ -567,7 +567,7 @@ export class NuiSmsServiceImplService { const config: Record = getConfig(false); const templateCreateUrl: string = String.format(TEMPLATE_ADD_URL, username); - Record templateCreateBody = new HashMap(); + const templateCreateBody: Record = new HashMap(); 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); - Record deleteBody = new HashMap(); + const deleteBody: Record = new HashMap(); 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); - Record templateInfoParam = new HashMap(); + const templateInfoParam: Record = new HashMap(); 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); - Record newNiuSmsConfig = new HashMap(); + const newNiuSmsConfig: Record = new HashMap(); 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 a4861bcb..31d7ca53 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 @@ -58,11 +58,11 @@ export class PayChannelServiceImplService { * getListByChannel */ async getListByChannel(...args: any[]): Promise { - PayChannel[] payChannel = this.payChannelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) + const payChannel: PayChannel[] = this.payChannelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) .eq("channel", channel) ); - PayChannelListVo[] list = new LinkedList(); + const list: PayChannelListVo[] = new LinkedList(); 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 1560d5d9..bdfe18b4 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); - PayRefundListVo[] list = new LinkedList(); + const list: PayRefundListVo[] = new LinkedList(); 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 18dc0077..20736005 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); - PayListVo[] list = new LinkedList(); + const list: PayListVo[] = new LinkedList(); for (const item of iPageRecords) { const vo: PayListVo = new PayListVo(); Object.assign(vo, item); @@ -161,7 +161,7 @@ export class PayServiceImplService { * getPayTypeList */ async getPayTypeList(...args: any[]): Promise { - PayTypeVo[] payTypeList = this.corePayService.getPayTypeByTrade(this.requestContext.siteId, "", ChannelEnum.H5); + const payTypeList: PayTypeVo[] = this.corePayService.getPayTypeByTrade(this.requestContext.siteId, "", ChannelEnum.H5); if (CommonUtils.isEmpty(payTypeList)) { return Collections.emptyList(); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-transfer-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-transfer-service-impl.service.ts index 790f71a3..4c10600e 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-transfer-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-transfer-service-impl.service.ts @@ -15,7 +15,7 @@ export class PayTransferServiceImplService { async setSceneId(...args: any[]): Promise { const config: Record = this.coreTransferSceneService.getWechatTransferSceneConfig(this.requestContext.siteId); - Record tradeScenelist = TransferSceneEnum.getWechatTransferSceneMap(); + const tradeScenelist: Record = TransferSceneEnum.getWechatTransferSceneMap(); if (!tradeScenelist.containsKey(param.getScene())) { throw new BadRequestException("不存在的商户转账场景"); } 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 8619e2e5..a218ffcd 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); - SiteAccountLogListVo[] list = new LinkedList(); + const list: SiteAccountLogListVo[] = new LinkedList(); 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 5559a8c1..63191bed 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 @@ -25,8 +25,8 @@ export class SiteGroupServiceImplService { [SiteGroup[], number] iPage = this.siteGroupRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); //获取所有的addon - Addon[] addonList = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); - SiteGroupListVo[] list = new LinkedList(); + const addonList: Addon[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); + const list: SiteGroupListVo[] = new LinkedList(); 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); - String[] addonStr = new ArrayList(); - String[] appStr = new ArrayList(); - List appList = new ArrayList(); - List addonListResult = new ArrayList(); + const addonStr: string[] = new ArrayList(); + const appStr: string[] = new ArrayList(); + const appList: SiteGroupListVo.IconAndTitle[] = new ArrayList(); + const addonListResult: SiteGroupListVo.IconAndTitle[] = new ArrayList(); for (const addon of addonList) { if(addonJson.includes(addon.key)){ @@ -149,7 +149,7 @@ export class SiteGroupServiceImplService { } if (!model.getApp() === group.getApp() || !model.getAddon() === group.getAddon()) { - Site[] siteList = this.siteRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); + const siteList: Site[] = this.siteRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); if (CommonUtils.isNotEmpty(siteList)) { for (const site of siteList) { this.siteService.siteAddonChange(site, model); @@ -179,9 +179,9 @@ export class SiteGroupServiceImplService { * checkAddon */ async checkAddon(...args: any[]): Promise { - Record addonListVoMap= this.coreAddonService.getInstallAddonList(); - String[] keys=new ArrayList<>(addonListVoMap.keySet()); - String[] addonString=JSONUtil.toList(jsonArray, String.class); + const addonListVoMap: Record = this.coreAddonService.getInstallAddonList(); + const keys: string[] = new ArrayList<>(addonListVoMap.keySet()); + const addonString: string[] = JSONUtil.toList(jsonArray, String.class); keys.retainAll(addonString); if(keys.length!=addonString.length){ throw new AdminException("SITE_GROUP_APP_NOT_EXIST"); @@ -192,8 +192,8 @@ export class SiteGroupServiceImplService { * getUserSiteGroupAll */ async getUserSiteGroupAll(...args: any[]): Promise { - SiteGroupListVo[] siteGroupListVoList=new ArrayList(); - SiteGroup[] siteGroupList= this.siteGroupRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); + const siteGroupListVoList: SiteGroupListVo[] = new ArrayList(); + const siteGroupList: SiteGroup[] = this.siteGroupRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); for (const siteGroup of siteGroupList) { const siteGroupListVo: SiteGroupListVo = new SiteGroupListVo(); 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 a5ac959b..ed3e0753 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); - SiteListVo[] list = new LinkedList(); + const list: SiteListVo[] = new LinkedList(); 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); - Record param = new HashMap(); + const param: Record = new HashMap(); param.put("site_id", siteId); param.put("main_app", siteGroup.getApp()); param.put("tag", "add"); @@ -208,7 +208,7 @@ export class SiteServiceImplService { * del */ async del(...args: any[]): Promise { - SysUserRole[] siteUserRoles = null; + const siteUserRoles: SysUserRole[] = null; const delResult: number = 0; try { @@ -373,7 +373,7 @@ export class SiteServiceImplService { if (CommonUtils.isEmpty(siteInfo)) { throw new AdminException("站点不存在"); } - String[] tables = SiteInitEnum.getSiteInitTables(siteId); + const tables: string[] = SiteInitEnum.getSiteInitTables(siteId); return this.coreSiteService.siteInitBySiteId(siteId, tables); } @@ -384,7 +384,7 @@ export class SiteServiceImplService { const authMenuList: JSONArray = this.authService.getAuthMenuTreeList(1, "all"); // 将菜单列表转换为Map，便于通过menu_key查找 - Record> authMenuMap = new HashMap(); + const authMenuMap: Record> = new HashMap(); for (const i of number = 0; i < authMenuList.length; i++) { const menu: Record = authMenuList.getRecord(i); authMenuMap.put(menu.get("menu_key").toString(), menu); @@ -396,17 +396,17 @@ export class SiteServiceImplService { return new SpecialMenuListVo("addon", new ArrayList()); } - Record showList = showCustomer(false); - List addonChildMenus = AddonChildMenuEnum.getAll(); + const showList: Record = showCustomer(false); + const addonChildMenus: AddonChildMenuEnum.MenuConfig[] = AddonChildMenuEnum.getAll(); - List menuList = new ArrayList(); + const menuList: SpecialMenuListVo.MenuVo[] = new ArrayList(); // 遍历插件子菜单，构建菜单列表 for (AddonChildMenuEnum.MenuConfig item : addonChildMenus) { const menuKey: string = item.key; - String[] menuKeyList = new ArrayList(); + const menuKeyList: string[] = new ArrayList(); if (showList.containsKey(menuKey) && showList.get(menuKey) instanceof Map) { - Record menuItem = (Record) showList.get(menuKey); + const menuItem: Record = (Record) showList.get(menuKey); if (menuItem.containsKey("list") && menuItem.get("list") instanceof List) { List> listItems = (List>) menuItem.get("list"); for (Record listItem : listItems) { @@ -431,7 +431,7 @@ export class SiteServiceImplService { tempMenu.status = "1"; tempMenu.setIsShow("1"); - List children = new ArrayList(); + const children: SpecialMenuListVo.MenuVo[] = new ArrayList(); 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 54845d3c..a9cee81d 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,11 +29,11 @@ export class SiteUserServiceImplService { userRoleMPJQueryWrapper.orderByDesc("nsur.id"); [SiteUserVo[], number] iPage = sysUserRoleMapper.selectJoinPage(new Page<>(page, limit), SiteUserVo.class, userRoleMPJQueryWrapper); for (const siteUserVo of iPageRecords) { - String[] roleArray=new ArrayList(); + const roleArray: string[] = new ArrayList(); 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())); - SysRole[] roleList=this.sysRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const roleList: SysRole[] = this.sysRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); for (const sysRole of roleList) { roleArray.push(sysRole.getRoleName()); } @@ -83,7 +83,7 @@ export class SiteUserServiceImplService { sysUserParam.setRealName(siteUserParam.getRealName()); this.sysUserService.edit(uid, sysUserParam); //创建用户站点管理权限 - String[] roleIds=siteUserParam.getRoleIds(); + const roleIds: string[] = siteUserParam.getRoleIds(); const sysUserRoleParam: SysUserRoleParam = new SysUserRoleParam(); sysUserRoleParam.siteId = this.requestContext.siteId; sysUserRoleParam.setRoleIds(JSONUtil.toJsonStr(roleIds)); @@ -117,7 +117,7 @@ export class SiteUserServiceImplService { * delete */ async delete(...args: any[]): Promise { - SysUserRole[] sysUserRoleList = this.sysUserRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq(SysUserRole::getUid, uid).eq(SysUserRole::getSiteId, this.requestContext.siteId).last("limit 1")); + const sysUserRoleList: SysUserRole[] = this.sysUserRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq(SysUserRole::getUid, uid).eq(SysUserRole::getSiteId, this.requestContext.siteId).last("limit 1")); if (CollectionUtils.isEmpty(sysUserRoleList)){ throw new BadRequestException("用户不存在"); } 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 92d71275..99e4bbab 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); - StatHourListVo[] list = new LinkedList(); + const list: StatHourListVo[] = new LinkedList(); 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 128e02de..9fe3a71b 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(); - String[] dates = new ArrayList(); - number[] memberValues = new ArrayList(); - number[] siteValues = new ArrayList(); + const dates: string[] = new ArrayList(); + const memberValues: number[] = new ArrayList(); + const siteValues: number[] = new ArrayList(); 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(); - String[] sexlist = new ArrayList(); + const sexlist: string[] = new ArrayList(); sexlist.push(SexEnum.path.basename(MAN)); sexlist.push(SexEnum.path.basename(WOMAN)); sexlist.push(SexEnum.path.basename(UNKNOWN)); - number[] sexCountList = new ArrayList(); + const sexCountList: number[] = new ArrayList(); const sexMemberParam: MemberStatSearchParam = new MemberStatSearchParam(); sexMemberParam.setSex(SexEnum.MAN.value); const manSexCount: number = this.coreMemberService.getMemberCount(sexMemberParam); @@ -124,10 +124,10 @@ export class StatServiceImplService { * 站点分组 统计 */ const siteGroupStat: StatTypeVo = new StatTypeVo(); - String[] grouplist = new ArrayList(); - number[] groupCountList = new ArrayList(); + const grouplist: string[] = new ArrayList(); + const groupCountList: number[] = new ArrayList(); - SiteGroup[] groupList = this.siteGroupService.getAll(); + const groupList: SiteGroup[] = this.siteGroupService.getAll(); for (const siteGroup of groupList) { grouplist.push(siteGroup.getGroupName()); const siteGroupParam: SiteSearchParam = new SiteSearchParam(); 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 d81f7d6f..19755187 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; - SysAgreementListVo[] list = new ArrayList(); + const list: SysAgreementListVo[] = new ArrayList(); 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 de72df49..cb22ee09 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 @@ -25,7 +25,7 @@ export class SysAreaServiceImplService { async getAreaTree(...args: any[]): Promise { any /* TODO: QueryWrapper */ queryWrapper = new QueryWrapper(); queryWrapper.le("level", level); - SysArea[] list = this.sysAreaRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const list: SysArea[] = this.sysAreaRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); const jsonArray: JSONArray = JSONUtil.parseArray(JSONUtil.toJsonStr(list)); return TreeUtils.listToTree(jsonArray, "id", "pid", "child"); } @@ -63,7 +63,7 @@ export class SysAreaServiceImplService { queryWrapper.orderByDesc(["sort", "id"]); [SysArea[], number] iPage = this.sysAreaRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - SysAreaListVo[] list = new LinkedList(); + const list: SysAreaListVo[] = new LinkedList(); 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 c919bbf2..034f54e4 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); - SysAttachmentListVo[] list = new LinkedList(); + const list: SysAttachmentListVo[] = new LinkedList(); for (const item of iPageRecords) { const vo: SysAttachmentListVo = new SysAttachmentListVo(); Object.assign(vo, item); @@ -82,7 +82,7 @@ export class SysAttachmentServiceImplService { * del */ async del(...args: any[]): Promise { - SysAttachment[] sysAttachmentList = this.sysAttachmentRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) + const sysAttachmentList: SysAttachment[] = this.sysAttachmentRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) .in("att_id", param.getAttIds())); if ((!sysAttachmentList || sysAttachmentList.length === 0)) { throw new BadRequestException("请选择要删除的附件"); @@ -104,9 +104,9 @@ export class SysAttachmentServiceImplService { if (CommonUtils.isNotEmpty(path.basename(searchParam))) queryWrapper.like("name", path.basename(searchParam)); if (CommonUtils.isNotEmpty(searchParam.type)) queryWrapper.eq("type", searchParam.type); - SysAttachmentCategory[] categorys = this.sysAttachmentCategoryRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); // 调用 selectList 方法 + const categorys: SysAttachmentCategory[] = this.sysAttachmentCategoryRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); // 调用 selectList 方法 - SysAttachmentCategoryListVo[] list = new LinkedList(); + const list: SysAttachmentCategoryListVo[] = new LinkedList(); 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 779771ef..50f29ed5 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); - SysBackupRecordsListVo[] list = new ArrayList(); + const list: SysBackupRecordsListVo[] = new ArrayList(); 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) { - number[] intArray = new ArrayList(); + const intArray: number[] = new ArrayList(); ((ArrayList) delParam.getIds()).forEach(item => { if (!item) throw new BadRequestException("id不能为空"); intArray.push(item); @@ -86,7 +86,7 @@ export class SysBackupRecordsServiceImplService { queryWrapper.eq("id", delParam.getIds()); } - SysBackupRecords[] backupRecords = this.sysBackupRecordsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const backupRecords: SysBackupRecords[] = this.sysBackupRecordsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); if (CommonUtils.isNotEmpty(backupRecords)) { for (const item of backupRecords) { const file: string = backupDir(item.getBackupKey(), "backup"); @@ -135,7 +135,7 @@ export class SysBackupRecordsServiceImplService { vo.setBackupRecord(record); if (!vo.getTask() === "") return vo; - String[] steps = vo.getSteps().keySet().stream(); + const steps: string[] = vo.getSteps().keySet().stream(); const step: string = steps.indexOf(vo.getStep()) < steps.length - 1 ? steps.get(steps.indexOf(vo.getStep()) + 1) : ""; if ((step && step.length > 0)) { @@ -143,7 +143,7 @@ export class SysBackupRecordsServiceImplService { vo.getExecuted().add(step); } try { - Record param = null; + const param: Record = null; param = (Record) dynamicMethodCall(step, vo); if (param != null) { vo.setParams(param); @@ -188,7 +188,7 @@ export class SysBackupRecordsServiceImplService { add(addParam); } - String[] steps = vo.getSteps().keySet().stream(); + const steps: string[] = vo.getSteps().keySet().stream(); const step: string = steps.indexOf(vo.getStep()) < steps.length - 1 ? steps.get(steps.indexOf(vo.getStep()) + 1) : ""; if ((step && step.length > 0)) { @@ -196,7 +196,7 @@ export class SysBackupRecordsServiceImplService { vo.getExecuted().add(step); } try { - Record param = null; + const param: Record = null; param = (Record) dynamicMethodCall(step, vo); if (param != null) { vo.setParams(param); 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 a0914cc9..374c2bc3 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 @@ -91,7 +91,7 @@ export class SysMenuServiceImplService { any /* TODO: QueryWrapper */ queryWrapper = new QueryWrapper(); queryWrapper.eq("app_type", "site"); queryWrapper.orderByDesc(["sort", "id"]); - SysMenu[] sysMenuList = this.sysMenuRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const sysMenuList: SysMenu[] = this.sysMenuRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); const jsonArray: JSONArray = JSONUtil.parseArray(JacksonUtils.toSnakeCaseJSONString(sysMenuList)); return TreeUtils.listToTree(jsonArray, "menu_key", "parent_key", "children"); }); @@ -102,7 +102,7 @@ export class SysMenuServiceImplService { */ async getMenuListByCondition(...args: any[]): Promise { return cached.remember(useCache, cacheTagName, ["getMenuListByCondition", appType, siteId, status, isButton, menuKeys, addon], uniqueKey => { - String[] addonList = this.coreSiteService.getAddonKeysBySiteId(siteId); + const addonList: string[] = this.coreSiteService.getAddonKeysBySiteId(siteId); any /* TODO: QueryWrapper */ queryWrapper = new QueryWrapper(); if (CommonUtils.isNotEmpty(appType)) { queryWrapper.eq("app_type", appType); @@ -125,7 +125,7 @@ export class SysMenuServiceImplService { //排除菜单 后期处理 - SysMenu[] menuList = this.sysMenuRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const menuList: SysMenu[] = this.sysMenuRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); return menuList; }); } @@ -137,16 +137,16 @@ export class SysMenuServiceImplService { const menuKeysVal: string = String.join("_", menuKeys); const menuKeysValMD5: string = SecureUtil.md5(menuKeysVal); const menuCatch: string = "menu" + menuKeysValMD5 + isTree.toString() + addon + siteId; - SysMenu[] outterMenuList = cached.cache(useCache, cacheTagName, menuCatch, uniqueKey => { + const outterMenuList: SysMenu[] = cached.cache(useCache, cacheTagName, menuCatch, uniqueKey => { //通过站点id获取支持的应用插件 - String[] addonList = this.coreSiteService.getAddonKeysBySiteId(siteId); + const addonList: string[] = this.coreSiteService.getAddonKeysBySiteId(siteId); //组装查询条件 any /* TODO: QueryWrapper */ queryWrapper = new QueryWrapper(); if (menuKeys.length > 0) { queryWrapper.in("menu_key", menuKeys); } - SysMenu[] paichuList = null; + const paichuList: SysMenu[] = null; if (addon !== "all"){ queryWrapper.eq("addon",addon); @@ -169,14 +169,14 @@ export class SysMenuServiceImplService { //排除菜单 if(ObjectUtil.isNotNull(paichuList) && paichuList.length>0){ - String[] paichuArr = new ArrayList(); + const paichuArr: string[] = new ArrayList(); for (const i of number = 0; i { - SysMenu[] menuList = new ArrayList(); + const outterMenuList: SysMenu[] = cached.cache(useCache, cacheTagName, key, uniqueKey => { + const menuList: SysMenu[] = new ArrayList(); try { any /* TODO: QueryWrapper */ queryWrapper = new QueryWrapper(); if (CommonUtils.isNotEmpty(appType)) { @@ -210,7 +210,7 @@ export class SysMenuServiceImplService { //站点相关插件 if (!RequestUtils.defaultSiteId() === siteId) { - String[] addonList = this.coreSiteService.getAddonKeysBySiteId(siteId); + const addonList: string[] = this.coreSiteService.getAddonKeysBySiteId(siteId); if (addonList.length > 0) { addonList.push(""); @@ -252,7 +252,7 @@ export class SysMenuServiceImplService { * getMenuByTypeDir */ async getMenuByTypeDir(...args: any[]): Promise { - SysMenu[] outterMenuList= cached.remember(useCache, cacheTagName, ["getMenuByTypeDir", addon], uniqueKey => { + const outterMenuList: SysMenu[] = cached.remember(useCache, cacheTagName, ["getMenuByTypeDir", addon], uniqueKey => { any /* TODO: QueryWrapper */ queryWrapper = new QueryWrapper(); queryWrapper.eq("app_type", "site"); queryWrapper.eq("menu_type", "0"); @@ -282,7 +282,7 @@ export class SysMenuServiceImplService { if (isButton == 0) { queryWrapper.in("menu_type", new number[]{0, 1}); } - SysMenu[] sysMenuList = this.sysMenuRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const sysMenuList: SysMenu[] = this.sysMenuRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); const jsonArray: JSONArray = JSONUtil.parseArray(JacksonUtils.toSnakeCaseJSONString(sysMenuList)); if (isTree == 0) { return jsonArray; @@ -306,7 +306,7 @@ export class SysMenuServiceImplService { if (isButton == 0) { queryWrapper.in("menu_type", new number[]{0, 1}); } - SysMenu[] sysMenuList = this.sysMenuRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const sysMenuList: SysMenu[] = this.sysMenuRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); const jsonArray: JSONArray = JSONUtil.parseArray(JacksonUtils.toSnakeCaseJSONString(sysMenuList)); if (isTree == 0) { return jsonArray; 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 086082ae..41801f28 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 @@ -23,10 +23,10 @@ export class SysNoticeLogServiceImplService { if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper, "create_time", searchParam.createTime); queryWrapper.orderByDesc("id"); - Record noticeEnum = NoticeEnum.getNotice(); + const noticeEnum: Record = NoticeEnum.getNotice(); [SysNoticeLog[], number] iPage = this.sysNoticeLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - SysNoticeLogListVo[] list = new LinkedList(); + const list: SysNoticeLogListVo[] = new LinkedList(); 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 83b4e229..22b360e5 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); - SysNoticeListVo[] list = new LinkedList(); + const list: SysNoticeListVo[] = new LinkedList(); 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 d85567ab..aa9ac4a3 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 @@ -25,10 +25,10 @@ export class SysNoticeSmsLogServiceImplService { queryWrapper.orderByDesc("id"); const smsTypeEnum: Record = SmsTypeEnum.type; - Record notice = NoticeEnum.getNotice(); + const notice: Record = NoticeEnum.getNotice(); [SysNoticeSmsLog[], number] iPage = this.sysNoticeSmsLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - SysNoticeSmsLogListVo[] list = new LinkedList(); + const list: SysNoticeSmsLogListVo[] = new LinkedList(); 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 559307d4..ed38a584 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); - SysPosterListVo[] list = new LinkedList(); + const list: SysPosterListVo[] = new LinkedList(); for (const item of iPageRecords) { const vo: SysPosterListVo = new SysPosterListVo(); Object.assign(vo, item); @@ -45,8 +45,8 @@ export class SysPosterServiceImplService { if (CommonUtils.isNotEmpty(path.basename(searchParam))) queryWrapper.like("name", path.basename(searchParam)); if (CommonUtils.isNotEmpty(searchParam.type)) queryWrapper.eq("type", searchParam.type); - SysPoster[] records = this.sysPosterRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - SysPosterListVo[] list = new LinkedList(); + const records: SysPoster[] = this.sysPosterRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const list: SysPosterListVo[] = new LinkedList(); 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")); - Record posterParam = new HashMap(); + const posterParam: Record = new HashMap(); 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 99b099d6..895b3cb5 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); - SysPrinterListVo[] list = new LinkedList(); + const list: SysPrinterListVo[] = new LinkedList(); 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()); } - SysPrinterListVo[] list = new LinkedList(); + const list: SysPrinterListVo[] = new LinkedList(); 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 d6841e05..1c128ea9 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); - SysPrinterTemplateListVo[] list = new LinkedList(); + const list: SysPrinterTemplateListVo[] = new LinkedList(); 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()); } - SysPrinterTemplateListVo[] voList = new LinkedList(); + const voList: SysPrinterTemplateListVo[] = new LinkedList(); for (const item of this.sysPrinterTemplateRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) { const vo: SysPrinterTemplateListVo = new SysPrinterTemplateListVo(); Object.assign(vo, item); @@ -125,7 +125,7 @@ export class SysPrinterTemplateServiceImplService { Lambdaany /* TODO: QueryWrapper */ printerLambdaQueryWrapper = new LambdaQueryWrapper(); printerLambdaQueryWrapper.eq(SysPrinter::getSiteId, this.requestContext.siteId) .like(SysPrinter::getTemplateType, template.getTemplateType()); - SysPrinter[] printers = this.sysPrinterRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const printers: SysPrinter[] = this.sysPrinterRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); Optional illegalPrinter = printers .filter(printer => CommonUtils.isNotEmpty(printer.value)) 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 1ea22371..d43d0642 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); - SysRoleListVo[] list = new LinkedList(); + const list: SysRoleListVo[] = new LinkedList(); for (const item of iPageRecords) { const vo: SysRoleListVo = new SysRoleListVo(); Object.assign(vo, item); @@ -116,14 +116,14 @@ export class SysRoleServiceImplService { if(ObjectUtil.isNotNull(roleIds) && roleIds.length>0){ queryWrapper.in("role_id", roleIds); } - SysRole[] roleList=this.sysRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const roleList: SysRole[] = this.sysRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); const roleMenuJson: JSONArray = new JSONArray(); for (const sysRole of roleList) { const ruleJson: JSONArray = JSONUtil.parseArray(sysRole.getRules()); roleMenuJson.addAll(ruleJson); } //去重 - String[] list = JSONUtil.toList(roleMenuJson, String.class); + const list: string[] = JSONUtil.toList(roleMenuJson, String.class); return CollectionUtil.distinct(list); } @@ -134,8 +134,8 @@ export class SysRoleServiceImplService { any /* TODO: QueryWrapper */ queryWrapper=new QueryWrapper(); queryWrapper.eq("site_id", this.requestContext.siteId); queryWrapper.eq("status", 1); - SysRole[] roleList=this.sysRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - SysRoleListVo[] sysRoleListVoList=new ArrayList(); + const roleList: SysRole[] = this.sysRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const sysRoleListVoList: SysRoleListVo[] = new ArrayList(); for (const sysRole of roleList) { const vo: SysRoleListVo = new SysRoleListVo(); Object.assign(vo, sysRole); @@ -155,9 +155,9 @@ export class SysRoleServiceImplService { if (!isAdmin){ if (StringUtils.isNotEmpty(sysUserRole.getRoleIds()) && "[]".equals(sysUserRole.getRoleIds())){ const roleIdsStr: string = sysUserRole.getRoleIds().replaceAll("[\\[\\]\"]", ""); - String[] menuIdsByRoleIds = getMenuIdsByRoleIds(this.requestContext.siteId, Arrays.stream(roleIdsStr.split(","))); + const menuIdsByRoleIds: string[] = getMenuIdsByRoleIds(this.requestContext.siteId, Arrays.stream(roleIdsStr.split(","))); for (const sysRoleListVo of sysRoleListVoList) { - String[] diff = new ArrayList<>(Collections.singleton(sysRoleListVo.getRules())); + const diff: string[] = new ArrayList<>(Collections.singleton(sysRoleListVo.getRules())); diff.removeAll(menuIdsByRoleIds); if ((diff && diff.length > 0)){ sysRoleListVo.setDisabled(true); 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 44358789..d7549e09 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 @@ -22,7 +22,7 @@ export class SysScheduleServiceImplService { */ async init(...args: any[]): Promise { // 通过 ApplicationContext 获取所有 IJobProvider 实现 - Record providers = applicationContext.getBeansOfType(IJobProvider.class); + const providers: Record = applicationContext.getBeansOfType(IJobProvider.class); log.info("Loaded job provider count: {}", providers.length); for (const provider of providers.values()) { log.info("Loaded job provider: {}", provider.getClass().getName()); @@ -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); // 返回结果集 - SysScheduleListVo[] sysScheduleListVoList = new LinkedList(); + const sysScheduleListVoList: SysScheduleListVo[] = new LinkedList(); for (const sysSchedule of sysSchedulePageRecords) { const sysScheduleListVo: SysScheduleListVo = new SysScheduleListVo(); Object.assign(sysScheduleListVo, sysSchedule); @@ -114,7 +114,7 @@ export class SysScheduleServiceImplService { // 校验任务是否存在 any /* TODO: QueryWrapper */ queryWrapper = new QueryWrapper(); queryWrapper.eq("`key`", jobKey); - SysSchedule[] sysScheduleList = this.sysScheduleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const sysScheduleList: SysSchedule[] = this.sysScheduleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); if (sysScheduleList != null && sysScheduleList.length > 0) { throw new Error("任务已经存在."); } @@ -176,8 +176,8 @@ export class SysScheduleServiceImplService { * template */ async template(...args: any[]): Promise { - SysScheduleTemplateVo[] sysScheduleTemplateVoList = new ArrayList(); - Set jobKeys = JobProviderFactory.jobKeys(); + const sysScheduleTemplateVoList: SysScheduleTemplateVo[] = new ArrayList(); + const jobKeys: string[] = JobProviderFactory.jobKeys(); for (const jobKey of jobKeys) { const jobInfo: JobInfo = JobProviderFactory.getJobInfo(jobKey); const sysScheduleTemplateVo: SysScheduleTemplateVo = new SysScheduleTemplateVo(); @@ -195,11 +195,11 @@ export class SysScheduleServiceImplService { * deleteScheduleLog */ async deleteScheduleLog(...args: any[]): Promise { - SysScheduleLog[] sysScheduleLogs = this.sysScheduleLogRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).lt("execute_time", successThreshold)); + const sysScheduleLogs: SysScheduleLog[] = this.sysScheduleLogRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).lt("execute_time", successThreshold)); if (CollectionUtils.isEmpty(sysScheduleLogs)) { return; } - Set delIds = sysScheduleLogs.map(SysScheduleLog::getId).collect(/* Collectors已删除 */.toSet()); + const delIds: number[] = sysScheduleLogs.map(SysScheduleLog::getId).collect(/* Collectors已删除 */.toSet()); sysScheduleLogMapper.deleteBatchIds(delIds); } @@ -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); - SysScheduleLogListVo[] result = new ArrayList(); + const result: SysScheduleLogListVo[] = new ArrayList(); 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 0f4fe728..0d572b22 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); - SysUpgradeRecordsListVo[] list = new ArrayList(); + const list: SysUpgradeRecordsListVo[] = new ArrayList(); 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 9c38e2b5..3093a23e 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); - SysUserLogListVo[] list = new LinkedList(); + const list: SysUserLogListVo[] = new LinkedList(); 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 04ce7645..6d0d36fe 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); - SysUserListVo[] list = new LinkedList(); + const list: SysUserListVo[] = new LinkedList(); for (const item of iPageRecords) { const vo: SysUserListVo = new SysUserListVo(); Object.assign(vo, item); @@ -83,7 +83,7 @@ export class SysUserServiceImplService { .setAlias("sur") .leftJoin("?_site s ON sur.site_id = s.site_id".replace("?_", this.appConfig.tablePrefix)); userRoleMPJQueryWrapper.eq("sur.uid", vo.getUid()); - SysUserSiteRoleVo[] userSiteRoleVoList = sysUserRoleMapper.selectJoinList(SysUserSiteRoleVo.class, userRoleMPJQueryWrapper); + const userSiteRoleVoList: SysUserSiteRoleVo[] = sysUserRoleMapper.selectJoinList(SysUserSiteRoleVo.class, userRoleMPJQueryWrapper); vo.setIsSuperAdmin(superAdminUid == id); vo.setRoles(userSiteRoleVoList); return vo; @@ -105,8 +105,8 @@ export class SysUserServiceImplService { const uid: number = sysUser.getUid(); //添加用户建站限制 - SysCreateSiteLimitParam[] createSiteLimitParamList = addParam.getCreateSiteLimit(); - UserCreateSiteLimit[] addList = new ArrayList(); + const createSiteLimitParamList: SysCreateSiteLimitParam[] = addParam.getCreateSiteLimit(); + const addList: UserCreateSiteLimit[] = new ArrayList(); if (ObjectUtil.isNotNull(createSiteLimitParamList) && createSiteLimitParamList.length > 0) { for (const sysCreateSiteLimitParam of createSiteLimitParamList) { const userCreateSiteLimit: UserCreateSiteLimit = new UserCreateSiteLimit(); @@ -231,7 +231,7 @@ export class SysUserServiceImplService { //添加用户 uid = this.push(sysUserParam); } - String[] roleIds = siteUserParam.getRoleIds(); + const roleIds: string[] = siteUserParam.getRoleIds(); const isAdmin: number = siteUserParam.getIsAdmin() == null ? 0 : siteUserParam.getIsAdmin(); /** * 创建用户站点管理权限 @@ -275,8 +275,8 @@ export class SysUserServiceImplService { * getUserCreateSiteLimit */ async getUserCreateSiteLimit(...args: any[]): Promise { - UserCreateSiteLimit[] userCreateSiteLimitList = this.userCreateSiteLimitRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); - SysUserCreateSiteLimitVo[] userCreateSiteLimitVoList = new ArrayList(); + const userCreateSiteLimitList: UserCreateSiteLimit[] = this.userCreateSiteLimitRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); + const userCreateSiteLimitVoList: SysUserCreateSiteLimitVo[] = new ArrayList(); for (const item of userCreateSiteLimitList) { const userCreateSiteLimitVo: SysUserCreateSiteLimitVo = new SysUserCreateSiteLimitVo(); BeanUtil.copyProperties(item, userCreateSiteLimitVo); @@ -350,7 +350,7 @@ export class SysUserServiceImplService { .eq("ur.site_id", 0); // 2. 获取并过滤用户 - SysUser[] userAll = StringUtils.isNotEmpty(username) + const userAll: SysUser[] = StringUtils.isNotEmpty(username) ? getUserAll().stream() .filter(item => item.getUsername() === username) @@ -361,18 +361,18 @@ export class SysUserServiceImplService { } // 3. 获取有角色的用户ID集合 - Set allRoleUserIds = this.sysUserRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).orderByDesc("id")) + const allRoleUserIds: number[] = this.sysUserRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).orderByDesc("id")) .stream() .map(SysUserRole::getUid) .collect(/* Collectors已删除 */.toSet()); // 4. 查询管理员用户 qw.orderByDesc("uid"); - SysUser[] adminUsers = this.sysUserRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const adminUsers: SysUser[] = this.sysUserRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); // 5. 查询无角色用户 - SysUser[] noRoleUsers = new ArrayList(); - number[] noRoleUserIds = userAll + const noRoleUsers: SysUser[] = new ArrayList(); + const noRoleUserIds: number[] = userAll .map(SysUser::getUid) .filter(uid => !allRoleUserIds.includes(uid)) ; @@ -384,7 +384,7 @@ export class SysUserServiceImplService { } // 6. 合并结果并去重 - Record resultMap = new LinkedHashMap(); + const resultMap: Record = new LinkedHashMap(); adminUsers.forEach(user => { const vo: SysUserInfoVo = new SysUserInfoVo(); 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 c52eb7af..cef6c0f4 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 { - Record data = new HashMap(); + const data: Record = new HashMap(); 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 97e8a76d..70fafc3d 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(); - LinkedMap[] apps = new LinkedList(); + const apps: Map[] = new LinkedList(); if ((!addon || addon.length === 0)) { - Record query = new HashMap(); + const query: Record = new HashMap(); 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")); - Record query = new HashMap(); + const query: Record = new HashMap(); query.put("product_key", instance.getProductKey()); query.put("app_key", key); query.put("version", addonModel.version); @@ -138,7 +138,7 @@ export class UpgradeServiceImplService { const instance: NiucloudUtils = NiucloudUtils.getInstance(); // 获取下载token - Record actionQuery = new HashMap(); + const actionQuery: Record = new const query: Record<>(); actionQuery.put("data[product_key]", instance.getProductKey()); actionQuery.put("data[framework_version]", this.appConfig.version); actionQuery.put("data[app_key]", upgradeContent.getContent().get(0).getApp().getAppKey()); @@ -146,7 +146,7 @@ export class UpgradeServiceImplService { const actionToken: Record = this.niucloudService.getActionToken("upgrade", actionQuery); - Record query = new HashMap(); + Record = new HashMap(); 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(); @@ -238,7 +238,7 @@ export class UpgradeServiceImplService { if (CommonUtils.isNotEmpty(vo.status) && vo.status === "restarting") return; - String[] steps = vo.getSteps().keySet().stream(); + const steps: string[] = vo.getSteps().keySet().stream(); const step: string = steps.indexOf(vo.getStep()) < steps.length - 1 ? steps.get(steps.indexOf(vo.getStep()) + 1) : ""; if ((step && step.length > 0)) { @@ -247,7 +247,7 @@ export class UpgradeServiceImplService { vo.getLog().add(vo.getSteps().get(step).getTitle()); } try { - Record param = null; + const param: Record = null; param = (Record) dynamicMethodCall(step, vo); if (param != null) { vo.setParams(param); @@ -301,7 +301,7 @@ export class UpgradeServiceImplService { const changeRecord: string = codeDir, version.getVersionNo( + ".txt"); if (fs.existsSync(changeRecord)) { // 移除新版本删除的文件 - String[] change = null; + const change: string[] = null; try { change = [fs.readFileSync(changeRecord, "UTF-8"].split("\n")); } catch (e) { @@ -371,7 +371,7 @@ export class UpgradeServiceImplService { } } - String[] addons = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) + const addons: string[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) .select("`key`") .eq("status", AddonStatusEnum.ON.getCode())) .stream().map(i => i.key) 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 d8dc225d..70bdae8c 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); - VerifierListVo[] list = new LinkedList(); + const list: VerifierListVo[] = new LinkedList(); for (const item of iPageRecords) { const vo: VerifierListVo = new VerifierListVo(); Object.assign(vo, item); @@ -47,9 +47,9 @@ export class VerifierServiceImplService { queryWrapper.eq("v.site_id", this.requestContext.siteId); queryWrapper.orderByDesc("id"); - VerifierVo[] verifierList = verifierMapper.selectJoinList(VerifierVo.class, queryWrapper); + const verifierList: VerifierVo[] = verifierMapper.selectJoinList(VerifierVo.class, queryWrapper); - VerifierListVo[] list = new LinkedList(); + const list: VerifierListVo[] = new LinkedList(); 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 70fb9f85..e2f2e94b 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); - VerifyListVo[] list = new LinkedList(); + const list: VerifyListVo[] = new LinkedList(); for (const item of iPageRecords) { const vo: VerifyListVo = new VerifyListVo(); Object.assign(vo, item); @@ -67,7 +67,7 @@ export class VerifyServiceImplService { VerifyInfoEventDefiner.const event: VerifyInfoEvent = new VerifyInfoEventDefiner.VerifyInfoEvent(); event.data = vo; - List list = EventAndSubscribeOfPublisher.publishAndCallback(event); + const list: VerifyInfoEventDefiner.VerifyInfoEventResult[] = EventAndSubscribeOfPublisher.publishAndCallback(event); if (!CollectionUtils.isEmpty(list)){ for (VerifyInfoEventDefiner.VerifyInfoEventResult verifyInfoEventResult : list) { if (verifyInfoEventResult != null && verifyInfoEventResult.getDataMap() != null && !verifyInfoEventResult.getDataMap().isEmpty()){ 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 e1c0ab46..7df222b7 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 @@ -13,10 +13,10 @@ export class WeappTemplateServiceImplService { * list */ async list(...args: any[]): Promise { - AddonNoticeListVo[] addonNoticeList = this.coreNoticeService.getAddonList(this.requestContext.siteId); + const addonNoticeList: AddonNoticeListVo[] = this.coreNoticeService.getAddonList(this.requestContext.siteId); for (const item of addonNoticeList) { - NoticeInfoVo[] filter = new LinkedList(); + const filter: NoticeInfoVo[] = new LinkedList(); for (const noticeItem of item.getNotice()) { if (noticeItem.getSupport_type().indexOf("weapp") != -1) { filter.push(noticeItem); @@ -31,8 +31,8 @@ export class WeappTemplateServiceImplService { * sync */ async sync(...args: any[]): Promise { - Record list = this.coreNoticeService.getList(this.requestContext.siteId, param.getKeys()); - String[] keys = [param.getKeys(]); + const list: Record = this.coreNoticeService.getList(this.requestContext.siteId, param.getKeys()); + const keys: string[] = [param.getKeys(]); for (const item of list.values()) { if (item.getWeapp() != null && (keys.length == 0 || keys.includes(item.key))) { 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 90792684..e6ab3def 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); - WeappVersionListVo[] list = new LinkedList(); + const list: WeappVersionListVo[] = new LinkedList(); for (const item of iPageRecords) { const vo: WeappVersionListVo = new WeappVersionListVo(); Object.assign(vo, item); @@ -48,7 +48,7 @@ export class WeappVersionServiceImplService { const lastVersion: WeappVersion = this.weappVersionRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_id", this.requestContext.siteId).orderByDesc("version_no").last("limit 1")); const versionNo: number = lastVersion == null ? 1 : lastVersion.getVersionNo() + 1; - String[] addons = this.coreSiteService.getAddonKeysBySiteId(this.requestContext.siteId); + const addons: string[] = this.coreSiteService.getAddonKeysBySiteId(this.requestContext.siteId); const uploadParam: WeappUploadParam = new WeappUploadParam(); uploadParam.setBaseUrl(RequestUtils.getDomain(true)); 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 75dc7723..9470e617 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); - WechatMediaListVo[] list = new LinkedList(); + const list: WechatMediaListVo[] = new LinkedList(); 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 d00abfc0..bd9836c1 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{ - Map params = new HashMap(); + const params: Record = new HashMap(); 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 62faf672..dddaad81 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); - WechatReplyListVo[] list = new LinkedList(); + const list: WechatReplyListVo[] = new LinkedList(); 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 636f0175..128f4fce 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 @@ -13,10 +13,10 @@ export class WechatTemplateServiceImplService { * list */ async list(...args: any[]): Promise { - AddonNoticeListVo[] addonNoticeList = this.coreNoticeService.getAddonList(this.requestContext.siteId); + const addonNoticeList: AddonNoticeListVo[] = this.coreNoticeService.getAddonList(this.requestContext.siteId); for (const item of addonNoticeList) { - NoticeInfoVo[] filter = new LinkedList(); + const filter: NoticeInfoVo[] = new LinkedList(); for (const noticeItem of item.getNotice()) { if (noticeItem.getSupport_type().indexOf("wechat") != -1) { filter.push(noticeItem); @@ -31,8 +31,8 @@ export class WechatTemplateServiceImplService { * sync */ async sync(...args: any[]): Promise { - Record list = this.coreNoticeService.getList(this.requestContext.siteId, param.getKeys()); - String[] keys = [param.getKeys(]); + const list: Record = this.coreNoticeService.getList(this.requestContext.siteId, param.getKeys()); + const keys: string[] = [param.getKeys(]); for (const item of list.values()) { if (item.getWechat() != null && (keys.length == 0 || keys.includes(item.key))) { 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 32f8a722..ef634eb9 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 */ }); - OplatformRecordVo[] listInfo = new LinkedList(); + const listInfo: OplatformRecordVo[] = new LinkedList(); 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 3341c197..56a075b4 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 @@ -55,7 +55,7 @@ export class WeappVersionServiceImplService { * add */ async add(...args: any[]): Promise { - SiteGroup[] siteGroupList = this.siteGroupRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).orderByAsc("create_time")); + const siteGroupList: SiteGroup[] = this.siteGroupRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).orderByAsc("create_time")); if (CommonUtils.isEmpty(siteGroupList)) throw new BadRequestException("请先添加站点套餐"); const siteGroup: SiteGroup = siteGroupId == null || siteGroupId == 0 ? siteGroupList.get(0) : siteGroupMapper.selectById(siteGroupId); @@ -74,7 +74,7 @@ export class WeappVersionServiceImplService { const config: OplatformConfigVo = this.coreOplatformConfigService.getWxOplatformConfig(); - String[] addon = CollUtil.newArrayList(); + const addon: string[] = CollUtil.newArrayList(); if (!siteGroup.getApp().isEmpty()) CollUtil.addAll(addon, JSONUtil.parseArray(siteGroup.getApp())); if (!siteGroup.getAddon().isEmpty()) CollUtil.addAll(addon, JSONUtil.parseArray(siteGroup.getAddon())); @@ -117,14 +117,14 @@ export class WeappVersionServiceImplService { const wxOpenService: WxOpenComponentService = WechatUtils.WxOpen().getWxOpenComponentService(); try { - WxOpenMaCodeTemplate[] draftList = this.wxOpenService.getTemplateDraftList(); + const draftList: WxOpenMaCodeTemplate[] = this.wxOpenService.getTemplateDraftList(); if (CommonUtils.isNotEmpty(draftList)) { for (const item of draftList) { if (item.getUserVersion() === version.getUserVersion()) { // 添加模板 this.wxOpenService.addToTemplate(item.getDraftId()); - WxOpenMaCodeTemplate[] templateList = this.wxOpenService.getTemplateList(); + const templateList: WxOpenMaCodeTemplate[] = this.wxOpenService.getTemplateList(); for (const template of templateList) { if (template.getUserVersion() === version.getUserVersion()) { version.setTemplateId(template.getTemplateId().toString()); @@ -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")); - SiteGroupWeappVersionVo[] list = new LinkedList(); + const list: SiteGroupWeappVersionVo[] = new LinkedList(); for (const item of iPageRecords) { const vo: SiteGroupWeappVersionVo = new SiteGroupWeappVersionVo(); @@ -334,9 +334,9 @@ export class WeappVersionServiceImplService { ); if (!version) throw new BadRequestException("平台尚未上传小程序到模板库"); - number[] siteIds = this.siteRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("group_id", param.getSiteGroupId())).stream().map(Site::getSiteId); + const siteIds: number[] = this.siteRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("group_id", param.getSiteGroupId())).stream().map(Site::getSiteId); if (CommonUtils.isNotEmpty(siteIds)) { - SysConfig[] authSite = this.sysConfigRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("config_key", ConfigKeyEnum.path.basename(WEAPP_AUTHORIZATION_INFO))); + const authSite: SysConfig[] = this.sysConfigRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("config_key", ConfigKeyEnum.path.basename(WEAPP_AUTHORIZATION_INFO))); if (CommonUtils.isNotEmpty(authSite)) { authSite.forEach(item => { weappCommit(item.siteId, param.getSiteGroupId(), version); 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 3605a3cb..7fe1891a 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 @@ -70,7 +70,7 @@ export class DiyFormServiceImplService { } } } else { - Record errorMap = new HashMap(); + const errorMap: Record = new HashMap(); errorMap.put("title", "当前表单无法查看"); errorMap.put("type", "表单状态"); errorMap.put("desc", "该表单已关闭"); @@ -107,25 +107,25 @@ export class DiyFormServiceImplService { if (writeConfig != null) { // 检查会员是否可以参与 - Record canJoinError = checkMemberCanJoinOrNot(this.requestContext.memberId, writeConfig); + const canJoinError: Record = checkMemberCanJoinOrNot(this.requestContext.memberId, writeConfig); if ((canJoinError && canJoinError.length > 0)) { throw new ApiException(canJoinError.get("desc")); } // 检查表单填写时间 - Record timeError = checkFormWriteTime(writeConfig); + const timeError: Record = checkFormWriteTime(writeConfig); if ((timeError && timeError.length > 0)) { throw new ApiException(timeError.get("desc")); } // 检查表单总填写次数限制 - Record formLimitError = checkFormWriteLimitNum(diyFormRecordsParam.formId, writeConfig); + const formLimitError: Record = checkFormWriteLimitNum(diyFormRecordsParam.formId, writeConfig); if ((formLimitError && formLimitError.length > 0)) { throw new ApiException(formLimitError.get("desc")); } // 检查会员填写次数限制 - Record memberLimitError = checkMemberWriteLimitNum(this.requestContext.memberId, diyFormRecordsParam.formId, writeConfig); + const memberLimitError: Record = checkMemberWriteLimitNum(this.requestContext.memberId, diyFormRecordsParam.formId, writeConfig); if ((memberLimitError && memberLimitError.length > 0)) { throw new ApiException(memberLimitError.get("desc")); } @@ -162,9 +162,9 @@ export class DiyFormServiceImplService { return vo; } BeanUtil.copyProperties(diyFormRecords, vo); - DiyFormRecordsFields[] list = this.diyFormRecordsFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); + const list: DiyFormRecordsFields[] = this.diyFormRecordsFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); if (CommonUtils.isNotEmpty(list)) { - DiyFormRecordsFieldsListVo[] volist = new ArrayList(); + const volist: DiyFormRecordsFieldsListVo[] = new ArrayList(); for (const item of list) { const diyFormRecordsFieldsListVo: DiyFormRecordsFieldsListVo = new DiyFormRecordsFieldsListVo(); Object.assign(diyFormRecordsFieldsListVo, item); @@ -190,14 +190,14 @@ export class DiyFormServiceImplService { mpjqw.eq("fr.member_id", this.requestContext.memberId) .eq("fr.form_id", formId) .orderByDesc("fr.create_time"); - DiyFormRecordsFields[] diyFormRecordsFields = diyFormRecordsMapper.selectJoinList(DiyFormRecordsFields.class, mpjqw); + const diyFormRecordsFields: DiyFormRecordsFields[] = diyFormRecordsMapper.selectJoinList(DiyFormRecordsFields.class, mpjqw); MPJany /* TODO: QueryWrapper */ diyFormMpjqw = new MPJQueryWrapper(); diyFormMpjqw.setAlias("df") .leftJoin("?_diy_form_fields dfi on dfi.form_id = df.form_id".replace("?_", this.appConfig.tablePrefix)); diyFormMpjqw.select("df.form_id,df.type, dfi.field_id, dfi.field_key, dfi.field_type, dfi.field_name, dfi.field_required, dfi.field_hidden, dfi.field_unique, dfi.privacy_protection"); diyFormMpjqw.eq("df.form_id", formId).eq("df.status", 1); - DiyFormFields[] diyFormFields = diyFormMapper.selectJoinList(DiyFormFields.class, diyFormMpjqw); + const diyFormFields: DiyFormFields[] = diyFormMapper.selectJoinList(DiyFormFields.class, diyFormMpjqw); if (CommonUtils.isEmpty(diyFormFields)) { @@ -208,7 +208,7 @@ export class DiyFormServiceImplService { } const result: DiyMemberRecordVo = setResult(diyFormFields); - Record fieldMap = diyFormRecordsFields.collect(/* Collectors已删除 */.toMap(DiyFormRecordsFields::getFieldKey, field => field)); + const fieldMap: Record = diyFormRecordsFields.collect(/* Collectors已删除 */.toMap(DiyFormRecordsFields::getFieldKey, field => field)); for (const field of result.getFormField()) { if (fieldMap.containsKey(field.getFieldKey())) { field.setFieldValue(fieldMap.get(field.getFieldKey()).getFieldValue() == null ? "" : fieldMap.get(field.getFieldKey()).getFieldValue()); @@ -240,25 +240,25 @@ export class DiyFormServiceImplService { if (writeConfig != null) { // 检查会员是否可以参与 - Record canJoinError = checkMemberCanJoinOrNot(this.requestContext.memberId, writeConfig); + const canJoinError: Record = checkMemberCanJoinOrNot(this.requestContext.memberId, writeConfig); if ((canJoinError && canJoinError.length > 0)) { throw new ApiException(canJoinError.get("desc")); } // 检查表单填写时间 - Record timeError = checkFormWriteTime(writeConfig); + const timeError: Record = checkFormWriteTime(writeConfig); if ((timeError && timeError.length > 0)) { throw new ApiException(timeError.get("desc")); } // 检查表单总填写次数限制 - Record formLimitError = checkFormWriteLimitNum(param.formId, writeConfig); + const formLimitError: Record = checkFormWriteLimitNum(param.formId, writeConfig); if ((formLimitError && formLimitError.length > 0)) { throw new ApiException(formLimitError.get("desc")); } // 检查会员填写次数限制 - Record memberLimitError = checkMemberWriteLimitNum(this.requestContext.memberId, param.formId, writeConfig); + const memberLimitError: Record = checkMemberWriteLimitNum(this.requestContext.memberId, param.formId, writeConfig); if ((memberLimitError && memberLimitError.length > 0)) { throw new ApiException(memberLimitError.get("desc")); } 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 8697eee1..586c0c3c 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 @@ -111,10 +111,10 @@ export class DiyServiceImplService { * tabbarList */ async tabbarList(...args: any[]): Promise { - BottomConfigVo[] list = this.coreDiyConfigService.getBottomList(); + const list: BottomConfigVo[] = this.coreDiyConfigService.getBottomList(); const site: SiteInfoVo = this.coreSiteService.getSiteCache(param.siteId()); - BottomConfigVo[] tabbarList = new LinkedList(); + const tabbarList: BottomConfigVo[] = new LinkedList(); 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 aff7111f..86f2833c 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; - Record data = new HashMap(); + const data: Record = new HashMap(); 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-address-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-address-service-impl.service.ts index b2342b15..92741915 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-address-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-address-service-impl.service.ts @@ -98,8 +98,8 @@ export class MemberAddressServiceImplService { queryWrapper.eq("site_id", param.siteId()); queryWrapper.eq("member_id", param.memberId()); queryWrapper.orderByDesc(["is_default", "id"]); - MemberAddress[] memberAddressList = this.memberAddressRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - MemberAddressListInfoVo[] memberAddressListInfoVo = CollectUtils.convert(memberAddressList, MemberAddressListInfoVo.class); + const memberAddressList: MemberAddress[] = this.memberAddressRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const memberAddressListInfoVo: MemberAddressListInfoVo[] = CollectUtils.convert(memberAddressList, MemberAddressListInfoVo.class); return memberAddressListInfoVo; } } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-cash-out-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-cash-out-service-impl.service.ts index 73dc2ef4..37c1e407 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-cash-out-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-cash-out-service-impl.service.ts @@ -100,7 +100,7 @@ export class MemberCashOutServiceImplService { if (CommonUtils.isNotEmpty(param.getAccountType())) queryWrapper.eq("account_type", param.getAccountType()); queryWrapper.orderByDesc(["create_time"]); [MemberCashOutAccount[], number] iPage = this.this.memberCashOutAccountRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - MemberCashOutAccountVo[] dataList = CollectUtils.convert(iPageRecords, MemberCashOutAccountVo.class); + const dataList: MemberCashOutAccountVo[] = CollectUtils.convert(iPageRecords, MemberCashOutAccountVo.class); return PageResult.build(page, limit, iPageTotal).setData(dataList); } 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 93267cf3..9581bf79 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 @@ -23,7 +23,7 @@ export class MemberLevelServiceImplService { any /* TODO: QueryWrapper */ queryWrapper = new QueryWrapper(); queryWrapper.select("level_id,level_name"); queryWrapper.in("id", idSet); - MemberLevel[] memberLevelList = this.memberLevelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const memberLevelList: MemberLevel[] = this.memberLevelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); return CollectUtils.convert(memberLevelList, MemberLevelSimpleInfoVo.class); } @@ -34,7 +34,7 @@ export class MemberLevelServiceImplService { any /* TODO: QueryWrapper */ queryWrapper = new QueryWrapper(); queryWrapper.select("level_id,site_id,level_name,growth,remark,level_benefits,level_gifts"); queryWrapper.eq("site_id", param.siteId()); - MemberLevel[] memberLevelList = this.memberLevelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const memberLevelList: MemberLevel[] = this.memberLevelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); if (memberLevelList == null) return null; @@ -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; - MemberLevelInfoVo[] list = new LinkedList(); + const list: MemberLevelInfoVo[] = new LinkedList(); 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 0f3df954..229b5bbf 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 @@ -23,7 +23,7 @@ export class MemberSignServiceImplService { queryWrapper.orderByDesc(["create_time"]); [MemberSign[], number] iPage = this.this.memberSignRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - MemberSignRecordVo[] dataList = CollectUtils.convert(iPageRecords, MemberSignRecordVo.class); + const dataList: MemberSignRecordVo[] = CollectUtils.convert(iPageRecords, MemberSignRecordVo.class); return PageResult.build(page, limit, iPageTotal).setData(dataList); } @@ -36,7 +36,7 @@ export class MemberSignServiceImplService { queryWrapper.eq("sign_id", param.getSignId()); queryWrapper.eq("site_id", param.siteId()); queryWrapper.eq("member_id", param.memberId()); - MemberSign[] memberSignList = this.this.memberSignRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const memberSignList: MemberSign[] = this.this.memberSignRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); const memberSignDetailsVo: MemberSignDetailsVo = null; if (memberSignList != null && memberSignList.length > 0) { memberSignDetailsVo = new MemberSignDetailsVo(); @@ -96,7 +96,7 @@ export class MemberSignServiceImplService { this.memberSignRepository.save(model); // 发放日签奖励 - Record dayAwardVar = new HashMap(); + const dayAwardVar: Record = new HashMap(); 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"); - Record continueAwardVar = new HashMap(); + const continueAwardVar: Record = new HashMap(); continueAwardVar.put("from_type", "continue_sign_award"); continueAwardVar.put("memo", "连签奖励"); this.coreMemberService.memberGiftGrant(param.siteId(), param.memberId(), continueAward, continueAwardVar); @@ -165,12 +165,12 @@ export class MemberSignServiceImplService { */ async signMonthRecord(...args: any[]): Promise { const vo: MemberSignMonthRecordVo = new MemberSignMonthRecordVo(); - number[] days = new ArrayList(); - List period = new ArrayList(); + const days: number[] = new ArrayList(); + const period: MemberSignMonthRecordVo.Period[] = new ArrayList(); const date: Date = DateUtil.parse(param.getYear() + "-" + param.getMonth() + "-1"); - MemberSign[] signRecord = this.this.memberSignRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) + const signRecord: MemberSign[] = this.this.memberSignRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) .between("create_time", DateUtil.beginOfMonth(date).getTime() / 1000, DateUtil.endOfMonth(date).getTime() / 1000) @@ -218,7 +218,7 @@ export class MemberSignServiceImplService { const award: Record = this.coreMemberService.getGiftContent(this.requestContext.siteId, item, "member_sign_continue"); - String[] content = new ArrayList(); + const content: string[] = new ArrayList(); const icon: string = ""; for (const key of award.keySet()) { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/pay/impl/pay-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/pay/impl/pay-service-impl.service.ts index 206b3256..014e72fc 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/pay/impl/pay-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/pay/impl/pay-service-impl.service.ts @@ -50,7 +50,7 @@ export class PayServiceImplService { any /* TODO: QueryWrapper */ payQueryWrapper = new QueryWrapper(); payQueryWrapper.eq("trade_type", tradeType) .eq("trade_id", tradeId); - Pay[] fromPayInfos = this.payRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const fromPayInfos: Pay[] = this.payRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); if (CommonUtils.isEmpty(fromPayInfos) || fromPayInfos.noneMatch(o => o.siteId === this.requestContext.siteId)) { throw new Error("支付单据不存在"); } @@ -74,7 +74,7 @@ export class PayServiceImplService { } PayTradeInfoDefiner.const event: PayTradeInfoEvent = new PayTradeInfoDefiner.PayTradeInfoEvent(tradeType, tradeId); - List trades = EventAndSubscribeOfPublisher.publishAndCallback(event); + const trades: PayTradeInfoDefiner.PayTradeInfoEventResult[] = EventAndSubscribeOfPublisher.publishAndCallback(event); if (CommonUtils.isNotEmpty(trades)) { vo.setTradeInfo(trades.get(0).getJsonObject()); } 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 f003877c..ca4361c7 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 @@ -16,7 +16,7 @@ export class SysAreaServiceImplService { // 缓存分组名称 const group: string = SysArea.class.getSimpleName(); // 缓存Key值计算参数 - Object[] paramList = [id]; + const paramList: Object[] = [id]; // 自动缓存 return cached.rememberObject(useCache, group, paramList, (uniqueKey) => { const sysArea: SysArea = sysAreaMapper.selectById(id); @@ -32,15 +32,15 @@ export class SysAreaServiceImplService { // 缓存分组名称 const group: string = SysAreaListVo.class.getSimpleName(); // 缓存Key值计算参数 - Object[] paramList = [pid]; + const paramList: Object[] = [pid]; // 自动缓存 - SysAreaListVo[] outterSysAreaList = cached.remember(useCache, group, paramList, uniqueKey => { - SysAreaListVo[] sysAreaVoList = null; + const outterSysAreaList: SysAreaListVo[] = cached.remember(useCache, group, paramList, uniqueKey => { + const sysAreaVoList: SysAreaListVo[] = null; try { any /* TODO: QueryWrapper */ queryWrapper = new QueryWrapper(); queryWrapper.select("id,name"); queryWrapper.eq("pid", pid); - SysArea[] sysAreaList = this.sysAreaRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const sysAreaList: SysArea[] = this.sysAreaRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); sysAreaVoList = CollectUtils.convert(sysAreaList, SysAreaListVo.class); } catch (e) { log.error("查询区域错误：", e.message); @@ -60,15 +60,15 @@ export class SysAreaServiceImplService { any /* TODO: QueryWrapper */ queryWrapper = new QueryWrapper(); queryWrapper.select("id, pid, name"); queryWrapper.eq("level", level); - SysArea[] sysAreaList = this.sysAreaRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const sysAreaList: SysArea[] = this.sysAreaRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); return CollectUtils.convert(sysAreaList, SysAreaLevelVo.class); } else if (level == 2) { // 参数级别：2，返回1级包含2级 any /* TODO: QueryWrapper */ queryWrapper = new QueryWrapper(); queryWrapper.select("id, pid, name, level"); queryWrapper.in("level", 1, 2); - SysArea[] sysAreaList = this.sysAreaRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - SysAreaLevelVo[] sysAreaLevelVoList = CollectUtils.convert(sysAreaList, SysAreaLevelVo.class); + const sysAreaList: SysArea[] = this.sysAreaRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const sysAreaLevelVoList: SysAreaLevelVo[] = CollectUtils.convert(sysAreaList, SysAreaLevelVo.class); Map sysAreaMap = ObjectGroupUtils.groupList(sysAreaLevelVoList, "pid"); return assembleAreaTree(sysAreaLevelVoList, sysAreaMap, 1, 2); } else if (level == 3) { @@ -76,8 +76,8 @@ export class SysAreaServiceImplService { any /* TODO: QueryWrapper */ queryWrapper = new QueryWrapper(); queryWrapper.select("id, pid, name, level"); queryWrapper.in("level", 1, 2, 3); - SysArea[] sysAreaList = this.sysAreaRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); - SysAreaLevelVo[] sysAreaLevelVoList = CollectUtils.convert(sysAreaList, SysAreaLevelVo.class); + const sysAreaList: SysArea[] = this.sysAreaRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const sysAreaLevelVoList: SysAreaLevelVo[] = CollectUtils.convert(sysAreaList, SysAreaLevelVo.class); Map sysAreaMap = ObjectGroupUtils.groupList(sysAreaLevelVoList, "pid"); return assembleAreaTree(sysAreaLevelVoList, sysAreaMap, 1, 3); } 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 3239e0b8..b8929e56 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 @@ -15,8 +15,8 @@ export class SysVerifyServiceImplService { */ async getVerifyCode(...args: any[]): Promise { // 生成核销码(对应业务调用) - String[] verifyCodeList = this.createVerifyCode(param.siteId(), param.memberId(), param.type, param.data); - SysVerifyGetCodeVo[] sysVerifyGetCodeVoList = new ArrayList(); + const verifyCodeList: string[] = this.createVerifyCode(param.siteId(), param.memberId(), param.type, param.data); + const sysVerifyGetCodeVoList: SysVerifyGetCodeVo[] = new ArrayList(); for (const verifyCode of verifyCodeList) { const sysVerifyGetCodeVo: SysVerifyGetCodeVo = new SysVerifyGetCodeVo(); sysVerifyGetCodeVo.setCode(verifyCode); @@ -77,18 +77,18 @@ export class SysVerifyServiceImplService { queryWrapper.orderByDesc(["create_time"]); [Verify[], number] iPage = this.this.verifyRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); - SysVerifyRecordsVo[] dataList = CollectUtils.convert(iPageRecords, SysVerifyRecordsVo.class); + const dataList: SysVerifyRecordsVo[] = CollectUtils.convert(iPageRecords, SysVerifyRecordsVo.class); if (dataList.length > 0) { // 以下代码块=====>用以填充SysVerifyRecordsVo类对象的：nickname, mobile, headimg属性 // 根据集合ID主键索引查询到对象列表 const withQueryWrapper: QueryWrapper = new QueryWrapper(); withQueryWrapper.select("member_id, nickname, mobile, headimg"); - number[] memberIdList = CollectBuildUtils.getKeyValueList(dataList, "verifierMemberId"); + const memberIdList: number[] = CollectBuildUtils.getKeyValueList(dataList, "verifierMemberId"); withQueryWrapper.in("member_id", memberIdList); - Member[] memberList = this.memberRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const memberList: Member[] = this.memberRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); // 先将数据分组，然后放入结果集 - Record memberMap = ObjectGroupUtils.group(memberList, "memberId"); + const memberMap: Record = ObjectGroupUtils.group(memberList, "memberId"); dataList.forEach(bean => { const member: Member = memberMap.get(bean.getVerifierMemberId()); if (member != null) { @@ -172,7 +172,7 @@ export class SysVerifyServiceImplService { */ async verifyCode(...args: any[]): Promise { // 1、获取核销码数据 - Record verifyMap = this.getCodeData(param.getCode()); + const verifyMap: Record = this.getCodeData(param.getCode()); // 检测站点数据 if (verifyMap.get("site_id") == null || !verifyMap.get("site_id").equals(param.siteId())) { // 核销码已过期 @@ -187,7 +187,7 @@ export class SysVerifyServiceImplService { throw new Error("核销员不存在"); } // 核销操作 - Record verifyDataMap = new HashMap(); + const verifyDataMap: Record = new HashMap(); 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/api/weapp/impl/weapp-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/weapp-service-impl.service.ts index 69698d49..b7d875e0 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/weapp-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/weapp-service-impl.service.ts @@ -161,7 +161,7 @@ export class WeappServiceImplService { if (pay == null) return null; WapOrderDetailPathDefiner.const event: WapOrderDetailPathEvent = new WapOrderDetailPathDefiner.WapOrderDetailPathEvent(pay); - List eventData = EventAndSubscribeOfPublisher.publishAndCallback(event); + const eventData: WapOrderDetailPathDefiner.WapOrderDetailPathResult[] = EventAndSubscribeOfPublisher.publishAndCallback(event); if (CommonUtils.isNotEmpty(eventData)) { return eventData.get(0); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-install-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-install-service-impl.service.ts index a8cc4b4f..4302668d 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-install-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-install-service-impl.service.ts @@ -172,14 +172,14 @@ export class CoreAddonInstallServiceImplService { this.installTask.put("addon", addon); if (result) { this.installTask.put("status", "success"); - String[] tips = AddonUpgradeHelper.getAddonInfo(); + const tips: string[] = AddonUpgradeHelper.getAddonInfo(); this.installTask.put("tips", tips); this.installCheck = false; log.warn("安装成功..........................................."); } else { this.installTask.put("status", "fail"); this.installTask.put("failReason", "jar包加载错误."); - String[] tips = AddonUpgradeHelper.getAddonInfo(); + const tips: string[] = AddonUpgradeHelper.getAddonInfo(); this.installTask.put("tips", tips); log.warn("执行回滚操作<---------------------begin--------------------->"); if (!this.appConfig.runActive.toLowerCase() === "dev".toLowerCase()) { diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-service-impl.service.ts index cd10d9d7..5191dc38 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-service-impl.service.ts @@ -25,7 +25,7 @@ export class CoreAddonServiceImplService { const localAddonCount: number = 0; try { // 获取本地所有的插件 - File[] localAddons = fs.readdirSync(this.appConfig.webRootDownAddon) + const localAddons: string[] = fs.readdirSync(this.appConfig.webRootDownAddon) .map(path => path.toFile()) .filter(file => fs.statSync(file).isDirectory()) ; 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 57ca772e..72055c8f 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 @@ -74,11 +74,11 @@ export class CoreAppCloudServiceImplService { const instance: NiucloudUtils = NiucloudUtils.getInstance(); - Record actionQuery = new HashMap(); + const actionQuery: Record = new const query: Record<>(); actionQuery.put("data[product_key]", instance.getProductKey()); const actionToken: Record = this.niucloudService.getActionToken("appbuild", actionQuery); - Record query = new HashMap(); + Record = new HashMap(); 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(); - Record query = new HashMap(); + const query: Record = new HashMap(); query.put("authorize_code", instance.getCode()); query.put("timestamp", key); @@ -140,7 +140,7 @@ export class CoreAppCloudServiceImplService { * generateSignCert */ async generateSignCert(...args: any[]): Promise { - Record query = new HashMap(); + const query: Record = new HashMap(); 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 f29ac5bd..10ed0adb 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; } - DiyTheme[] diyThemes = new ArrayList(); + const diyThemes: DiyTheme[] = new ArrayList(); // 处理主题配置 themeColorList.forEach(item => { @@ -60,7 +60,7 @@ export class CoreDiyServiceImplService { addAppThemes(diyThemes, siteId, "app", app.key, colors); // 添加关联插件主题 - Addon[] addons = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) + const addons: Addon[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) .eq(Addon::getSupportApp, app.key)); if (StringUtils.isNotEmptyArray(addons)) { 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 14b21cf1..cb655cd1 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 @@ -39,13 +39,13 @@ export class CoreDiyFormRecordsServiceImplService { [DiyFormRecordsListVo[], number] iPage = diyFormRecordsMapper.selectJoinPage(new Page<>(page, limit), DiyFormRecordsListVo.class, queryWrapper); for (const vo of iPageRecords) { - DiyFormRecordsFields[] list = this.diyFormRecordsFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); + const list: DiyFormRecordsFields[] = this.diyFormRecordsFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); const memberVo: Member = new Member(); Object.assign(memberVo, vo); vo.setMember(memberVo); if (CommonUtils.isNotEmpty(list)) { - Record map = new HashMap(); + const map: Record = new HashMap(); for (const item of list) { const diyFormRecordsFieldsListVo: DiyFormRecordsFieldsListVo = new DiyFormRecordsFieldsListVo(); Object.assign(diyFormRecordsFieldsListVo, item); @@ -69,9 +69,9 @@ export class CoreDiyFormRecordsServiceImplService { const vo: DiyFormRecordsInfoVo = new DiyFormRecordsInfoVo(); Object.assign(vo, model); - DiyFormRecordsFields[] list = this.diyFormRecordsFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); + const list: DiyFormRecordsFields[] = this.diyFormRecordsFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))); if (CommonUtils.isNotEmpty(list)) { - Record map = new HashMap(); + const map: Record = new HashMap(); for (const item of list) { const diyFormRecordsFieldsListVo: DiyFormRecordsFieldsListVo = new DiyFormRecordsFieldsListVo(); Object.assign(diyFormRecordsFieldsListVo, item); @@ -96,15 +96,15 @@ export class CoreDiyFormRecordsServiceImplService { model.createTime = Date.now( / 1000); model.value = JSONUtil.toJsonStr(addParam.value); this.diyFormRecordsRepository.save(model); - DiyFormFields[] list = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", addParam.siteId)); - Record fieldList = new HashMap(); + const list: DiyFormFields[] = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", addParam.siteId)); + const fieldList: Record = new HashMap(); if (CommonUtils.isNotEmpty(list)) { for (const item of list) { fieldList.put(item.getFieldKey(), item); } } - DiyFormRecordsFields[] recordsFieldsList = new ArrayList(); + const recordsFieldsList: DiyFormRecordsFields[] = new ArrayList(); if (CommonUtils.isNotEmpty(addParam.value)) { const components: JSONArray = JSONUtil.parseArray(addParam.value); @@ -139,7 +139,7 @@ export class CoreDiyFormRecordsServiceImplService { .eq("form_id", addParam.formId) .eq("field_key", component.get("id")) .eq("field_type", component.get("componentName")); - Object[] fieldValues = diyFormRecordsFieldsMapper.selectObjs(uniqueQuery); + const fieldValues: Object[] = diyFormRecordsFieldsMapper.selectObjs(uniqueQuery); if (formFieldInfo.getFieldUnique() == 1 && fieldValues.includes(fieldValue)) { throw new BadRequestException(field.getOrDefault("name", component.get("componentTitle")) + "不能重复"); } @@ -216,7 +216,7 @@ export class CoreDiyFormRecordsServiceImplService { .set(DiyFormRecords::getValue, JSONUtil.toJsonStr(param.value))); // 获取字段配置 - Record formFieldMap = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) + const formFieldMap: Record = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) .select(DiyFormFields::getFieldKey, DiyFormFields::getFieldRequired, DiyFormFields::getFieldUnique) @@ -225,7 +225,7 @@ export class CoreDiyFormRecordsServiceImplService { .collect(/* Collectors已删除 */.toMap(DiyFormFields::getFieldKey, Function.identity())); // 处理字段数据 - DiyFormRecordsFields[] recordsFields = new ArrayList(); + const recordsFields: DiyFormRecordsFields[] = new ArrayList(); 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 677d5245..2a5de0ef 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); } - Record data = new HashMap(); + const data: Record = new HashMap(); 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/member/impl/core-member-level-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-level-service-impl.service.ts index f0be651f..e2b37cbc 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-level-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/member/impl/core-member-level-service-impl.service.ts @@ -28,10 +28,10 @@ export class CoreMemberLevelServiceImplService { } } upgradeQuery.orderByAsc("growth"); - MemberLevel[] upgrade = this.memberLevelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const upgrade: MemberLevel[] = this.memberLevelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); if (CommonUtils.isNotEmpty(upgrade)) { - Record vars = new HashRecord(); + const vars: Record = new HashRecord(); vars.put("from_type", "level_upgrade"); vars.put("memo", "会员升级奖励"); 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 3b3f0da1..b130fe03 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 @@ -31,14 +31,14 @@ export class CoreNoticeServiceImplService { * getAddonList */ async getAddonList(...args: any[]): Promise { - SysNotice[] list = this.sysNoticeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); - Record map = new HashMap(); + const list: SysNotice[] = this.sysNoticeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); + const map: Record = new const notice: Record<>(); if (ObjectUtil.isNotNull(list)) { for (const item of list) { map.put(item.key, item); } } - Record notice = new HashMap(); + Record = new HashMap(); for (Map.Entry noticeMap : NoticeEnum.getNotice().entrySet()) { const vo: NoticeInfoVo = new NoticeInfoVo(); @@ -65,12 +65,12 @@ export class CoreNoticeServiceImplService { notice.put(noticeMap.key, vo); } - Addon[] addonList = this.coreSiteService.getSiteAddons(siteId); + const addonList: Addon[] = this.coreSiteService.getSiteAddons(siteId); const adminAddon: Addon = new Addon(); adminAddon.key = "system"; adminAddon.title = "系统"; addonList.push(0, adminAddon); - AddonNoticeListVo[] noticeAddonList = new ArrayList(); + const noticeAddonList: AddonNoticeListVo[] = new ArrayList(); for (const addon of addonList) { const noticeListVo: AddonNoticeListVo = new AddonNoticeListVo(); noticeListVo.key = addon.key; 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 11f8120b..747ed6d3 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,9 +33,9 @@ export class CorePayChannelServiceImplService { * getAllowPayTypeByChannel */ async getAllowPayTypeByChannel(...args: any[]): Promise { - PayTypeVo[] list = new LinkedList(); + const list: PayTypeVo[] = new LinkedList(); - PayChannel[] payChannelList = this.payChannelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) + const payChannelList: PayChannel[] = this.payChannelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) .eq("site_id", siteId) .eq("status", 1) .eq("channel", channel)); 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 2e2ad978..4c59a2b0 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); - PayRefundListVo[] list = new LinkedList(); + const list: PayRefundListVo[] = new LinkedList(); 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 d81f2ec4..057bf9e8 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); - Record json = new HashMap(); + const json: Record = new HashMap(); json.put("openid", param.getOpenid()); pay.setJson(JSONUtil.toJsonStr(json)); this.payMapper.updateById(pay); @@ -112,7 +112,7 @@ export class CorePayServiceImplService { const vo: GetInfoByTradeVo = new GetInfoByTradeVo(); BeanUtil.copyProperties(pay, vo); - PayTypeVo[] payTypeList = this.corePayChannelService.getAllowPayTypeByChannel(siteId, channel, tradeType); + const payTypeList: PayTypeVo[] = this.corePayChannelService.getAllowPayTypeByChannel(siteId, channel, tradeType); vo.setPayTypeList(payTypeList); if (CommonUtils.isNotEmpty(payTypeList) && ObjectUtil === scene, "friendspay") { @@ -156,7 +156,7 @@ export class CorePayServiceImplService { event.name = "PayCreateEvent"; event.setTradeType(tradeType); event.setTradeId(tradeId); - List eventData = EventAndSubscribeOfPublisher.publishAndCallback(event); + const eventData: PayCreateEventDefiner.PayCreateEventResult[] = EventAndSubscribeOfPublisher.publishAndCallback(event); if (eventData.length == 0) throw new BadRequestException("无效的交易类型"); PayCreateEventDefiner.const data: PayCreateEventResult = eventData.get(0); diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/poster/impl/core-poster-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/poster/impl/core-poster-service-impl.service.ts index 9d704804..5975d95a 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/poster/impl/core-poster-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/poster/impl/core-poster-service-impl.service.ts @@ -46,7 +46,7 @@ export class CorePosterServiceImplService { event.type = param.type; event.setParam(param.getParam()); event.setChannel(param.getChannel()); - List eventData = EventAndSubscribeOfPublisher.publishAndCallback(event); + const eventData: GetPosterDataEventDefiner.GetPosterDataResult[] = EventAndSubscribeOfPublisher.publishAndCallback(event); if (eventData.length == 0) throw new BadRequestException("未获取到海报数据"); GetPosterDataEventDefiner.const posterData: GetPosterDataResult = eventData.get(0); 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 e182f89d..a72b1ba8 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 @@ -18,10 +18,10 @@ export class CoreScheduleServiceImplService { const schedule: JSONArray = jsonModuleLoader.getResultSet("core", "schedule.json"); if (CommonUtils.isNotEmpty(schedule)) { - SysSchedule[] scheduleList = this.sysScheduleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).select("id,`key`")); - Record scheduleMap = scheduleList.collect(/* Collectors已删除 */.toMap(SysSchedule::getKey, i => i)); + const scheduleList: SysSchedule[] = this.sysScheduleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).select("id,`key`")); + const scheduleMap: Record = scheduleList.collect(/* Collectors已删除 */.toMap(SysSchedule::getKey, i => i)); - SysSchedule[] list = new LinkedList(); + const list: SysSchedule[] = new LinkedList(); for (const i of number = 0; i < schedule.length; i++) { const item: Record = schedule.getRecord(i); @@ -77,10 +77,10 @@ export class CoreScheduleServiceImplService { } if (CommonUtils.isNotEmpty(schedule)) { - SysSchedule[] scheduleList = this.sysScheduleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).select("id,`key`")); - Record scheduleMap = scheduleList.collect(/* Collectors已删除 */.toMap(SysSchedule::getKey, i => i)); + const scheduleList: SysSchedule[] = this.sysScheduleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).select("id,`key`")); + const scheduleMap: Record = scheduleList.collect(/* Collectors已删除 */.toMap(SysSchedule::getKey, i => i)); - SysSchedule[] list = new LinkedList(); + const list: SysSchedule[] = new LinkedList(); for (const i of number = 0; i < schedule.length; i++) { const item: Record = schedule.getRecord(i); @@ -120,7 +120,7 @@ export class CoreScheduleServiceImplService { try { this.sysScheduleRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ }); installSystemSchedule(); - Addon[] addonList = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq(Addon::getStatus, 1)); + const addonList: Addon[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq(Addon::getStatus, 1)); addonList.forEach(addon => { installAddonSchedule(addon.key); }); 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 c5e9096f..cc273c1c 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 @@ -41,7 +41,7 @@ export class CoreSiteServiceImplService { } } //去重 - String[] list = JSONUtil.toList(siteAddonJson, String.class); + const list: string[] = JSONUtil.toList(siteAddonJson, String.class); return CollectionUtil.distinct(list); }); } @@ -128,7 +128,7 @@ export class CoreSiteServiceImplService { * siteInitBySiteId */ async siteInitBySiteId(...args: any[]): Promise { - number[] userIds = new ArrayList(); + const userIds: number[] = new ArrayList(); 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 617510c3..d8203777 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 @@ -41,7 +41,7 @@ export class CoreExportServiceImplService { const typeColumn: JSONArray = new JSONArray(); for (const obj of exportDataColumn) { const jsonObject: Record = (Record) obj; - Set setString = jsonObject.keySet(); + const setString: string[] = jsonObject.keySet(); for (const key of setString) { if (key === type) { const values: Record = jsonObject.getRecord(key); @@ -63,7 +63,7 @@ export class CoreExportServiceImplService { exportDataEvent.type = type; exportDataEvent.setWhere(where); exportDataEvent.setPageParam(pageParam); - List resultList = EventAndSubscribeOfPublisher.publishAndCallback(exportDataEvent); + const resultList: ExportDataEventDefiner.ExportDataEventResult[] = EventAndSubscribeOfPublisher.publishAndCallback(exportDataEvent); const exportResult: JSONArray = new JSONArray(); for (ExportDataEventDefiner.ExportDataEventResult itemResult : resultList) { if (CommonUtils.isNotEmpty(itemResult.getResultData())) { @@ -83,8 +83,8 @@ export class CoreExportServiceImplService { exportDynamic.setFileName(fileName); const filePath: string = this.appConfig.webRootDownResource + relativePath; exportDynamic.setFilePath(filePath); - ExportHeads[] headsList = new ArrayList<>(CollectionUtil.size(headColumn)); - String[] keyList = new ArrayList<>(CollectionUtil.size(headColumn)); + const headsList: ExportHeads[] = new ArrayList<>(CollectionUtil.size(headColumn)); + const keyList: string[] = new ArrayList<>(CollectionUtil.size(headColumn)); for (const headObj of headColumn) { const itemObject: Record = (Record) headObj; const itemKey: string = itemObject.keySet().stream().iterator().next(); @@ -99,7 +99,7 @@ export class CoreExportServiceImplService { List datas = new ArrayList<>(CollectionUtil.size(valueData)); for (const itemObj of valueData) { const itemJsonObject: Record = (Record) itemObj; - Object[] itemDatas = new ArrayList(); + const itemDatas: Object[] = new ArrayList(); for (const itemKey of keyList) { itemDatas.push(itemJsonObject.getStr(itemKey, "")); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-menu-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-menu-service-impl.service.ts index aa55c2a9..6f15f322 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-menu-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-menu-service-impl.service.ts @@ -20,14 +20,14 @@ export class CoreMenuServiceImplService { const adminMenu: Record = JsonModuleLoader.build().getResultElement(addon, "menu/admin.json"); if(CommonUtils.isNotEmpty(adminMenu)){ if (adminMenu.getJSONArray("menu") != null) { - SysMenu[] adminMenuBeanList = this.menuTreeToList(TreeUtils.treeToList(adminMenu.getJSONArray("menu"), "parent_key", "", "menu_key", "children"), addon, "admin"); + const adminMenuBeanList: SysMenu[] = this.menuTreeToList(TreeUtils.treeToList(adminMenu.getJSONArray("menu"), "parent_key", "", "menu_key", "children"), addon, "admin"); super.saveBatch(adminMenuBeanList); } } const siteMenu: Record = JsonModuleLoader.build().getResultElement(addon, "menu/site.json"); if(CommonUtils.isNotEmpty(siteMenu)){ if (siteMenu.getJSONArray("menu") != null) { - SysMenu[] siteMenuBeanList = this.menuTreeToList(TreeUtils.treeToList(siteMenu.getJSONArray("menu"), "parent_key", "", "menu_key", "children"), addon, "site"); + const siteMenuBeanList: SysMenu[] = this.menuTreeToList(TreeUtils.treeToList(siteMenu.getJSONArray("menu"), "parent_key", "", "menu_key", "children"), addon, "site"); super.saveBatch(siteMenuBeanList); } } @@ -48,14 +48,14 @@ export class CoreMenuServiceImplService { if (fs.existsSync(adminMenu)) { const jsonString: string = JsonUtils.parseObject(fs.readFileSync(path.join(adminMenu); - Record[] menuList = TreeUtils.treeToList(JsonUtils.parseObject(jsonString), 'utf-8')).getJSONArray("menu"), "parent_key", "", "menu_key", "children"); - SysMenu[] adminMenuBeanList = this.menuTreeToList(menuList, addon, "admin"); + const menuList: Record[] = TreeUtils.treeToList(JsonUtils.parseObject(jsonString), 'utf-8')).getJSONArray("menu"), "parent_key", "", "menu_key", "children"); + const adminMenuBeanList: SysMenu[] = this.menuTreeToList(menuList, addon, "admin"); super.saveBatch(adminMenuBeanList); } if (fs.existsSync(siteMenu)) { const jsonString: string = JsonUtils.parseObject(fs.readFileSync(path.join(siteMenu); - Record[] menuList = TreeUtils.treeToList(JsonUtils.parseObject(jsonString), 'utf-8')).getJSONArray("menu"), "parent_key", "", "menu_key", "children"); - SysMenu[] siteMenuBeanList = this.menuTreeToList(menuList, addon, "site"); + const menuList: Record[] = TreeUtils.treeToList(JsonUtils.parseObject(jsonString), 'utf-8')).getJSONArray("menu"), "parent_key", "", "menu_key", "children"); + const siteMenuBeanList: SysMenu[] = this.menuTreeToList(menuList, addon, "site"); super.saveBatch(siteMenuBeanList); } @@ -79,7 +79,7 @@ export class CoreMenuServiceImplService { */ async refreshAllAddonMenu(...args: any[]): Promise { //查询所有的插件 - Addon[] addonList=this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); + const addonList: Addon[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); for (const addon of addonList) { this.refreshAddonMenu(addon.key); } diff --git a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-printer-service-impl.service.ts b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-printer-service-impl.service.ts index 7b0f26e4..761de9d6 100644 --- a/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-printer-service-impl.service.ts +++ b/wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/sys/impl/core-printer-service-impl.service.ts @@ -62,7 +62,7 @@ export class CorePrinterServiceImplService { event.siteId = param.siteId; event.setParam(param); event.setAuthority(false); - SysPrinterPrintTicketResult[] results = CallbackPublisher.publishReturnList(event) + const results: SysPrinterPrintTicketResult[] = CallbackPublisher.publishReturnList(event) .stream() .map(result => (SysPrinterPrintTicketResult) result) ; @@ -76,7 +76,7 @@ export class CorePrinterServiceImplService { return vo; } - List items = results + const items: SysPrinterPrintTicketResult.Item[] = results .flatMap(result => result.data.stream()) ; if (CommonUtils.isEmpty(items)) { 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 6dad353c..b1031476 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; - CoreStorAgeConfigVo[] coreStorAgeConfigVoList = new ArrayList(); + const coreStorAgeConfigVoList: CoreStorAgeConfigVo[] = new ArrayList(); for (const key of storageTypeList.keySet()) { const storageValues: Record = JsonUtils.parseObject(storageTypeList.get(key)); const coreStorAgeConfigVo: CoreStorAgeConfigVo = new CoreStorAgeConfigVo(); @@ -65,7 +65,7 @@ export class CoreStorageServiceImplService { * getDefaultStorage */ async getDefaultStorage(...args: any[]): Promise { - CoreStorAgeConfigVo[] storageList = this.getStorageList(siteId); + const storageList: CoreStorAgeConfigVo[] = this.getStorageList(siteId); const config: Record = new Record(); for (const item of storageList) { if (item.getIsUse() === StorageEnum.ON.getCode()) { @@ -80,7 +80,7 @@ export class CoreStorageServiceImplService { * getStorageByType */ async getStorageByType(...args: any[]): Promise { - CoreStorAgeConfigVo[] storageList = this.getStorageList(siteId); + const storageList: CoreStorAgeConfigVo[] = this.getStorageList(siteId); const config: Record = new Record(); for (const item of storageList) { if (item.getIsUse() === StorageEnum.ON.getCode() && item.getStorageType() === StorageType) { 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 5f0cd334..ee1f1b6b 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 @@ -38,11 +38,11 @@ export class CoreWeappCloudServiceImplService { const instance: NiucloudUtils = NiucloudUtils.getInstance(); - Record actionQuery = new HashMap(); + const actionQuery: Record = new const query: Record<>(); actionQuery.put("data[product_key]", instance.getProductKey()); const actionToken: Record = this.niucloudService.getActionToken("weappbuild", actionQuery); - Record query = new HashMap(); + Record = new HashMap(); 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(); - Record query = new HashMap(); + const query: Record = new HashMap(); query.put("authorize_code", instance.getCode()); query.put("timestamp", key); @@ -91,7 +91,7 @@ export class CoreWeappCloudServiceImplService { try { const instance: NiucloudUtils = NiucloudUtils.getInstance(); - Record query = new HashMap(); + const query: Record = new HashMap(); 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 2b2cd028..dd2f4130 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()); // 处理发货列表 - ShippingListBean[] wxShippingList = new ArrayList(); + const wxShippingList: ShippingListBean[] = new ArrayList(); 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 373f7db1..8ba2c2f8 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 { - String[] scene = new LinkedList(); + const scene: string[] = new LinkedList(); 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 { - String[] scene = new LinkedList(); + const scene: string[] = new LinkedList(); for (const key of data.keySet()) { scene.push(key + "-" + data.get(key).toString()); }