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

fix: 修复Getter/Setter转换器 - 支持链式调用

Browse Source 
🐛 Bug: getter/setter转换器不支持链式调用
- item.key.getName() ❌ 未转换
- delParam.ids.getClass().getName() ❌ 未转换

✅ 修复:
- 正则从 /(\w+)\.get/ 改为 /([\w.()]+)\.get/
- 支持 obj.method().getXxx() 链式调用
- 支持 obj.method().setXxx(value) 链式调用

📊 预期效果: 彻底转换所有getter/setter调用
This commit is contained in:
wanwu
2025-10-29 16:55:10 +08:00
parent 2df331d61c
commit c999557c2a
138 changed files with 2515 additions and 2513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wwjcloud-nest-v1/tools/java-to-nestjs-migration/converters/method/getter-setter.converter.js
View File

@@ -23,8 +23,9 @@ class GetterSetterConverter {
// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
// 通用模式：obj.getXxx() → obj.xxx // 通用模式：obj.getXxx() → obj.xxx
// 匹配: (对象).get(首字母大写的属性名)() // 支持链式调用：obj.method().getXxx() 或 obj.getXxx()
tsCode = tsCode.replace(/(\w+)\.get([A-Z]\w*)\(\)/g, (match, obj, property) => { // 匹配: (对象或表达式).get(首字母大写的属性名)()
tsCode = tsCode.replace(/([\w.()]+)\.get([A-Z]\w*)\(\)/g, (match, obj, property) => {
// 将首字母转换为小写 // 将首字母转换为小写
const propertyName = property.charAt(0).toLowerCase() + property.slice(1); const propertyName = property.charAt(0).toLowerCase() + property.slice(1);
return `${obj}.${propertyName}`; return `${obj}.${propertyName}`;
@@ -35,8 +36,9 @@ class GetterSetterConverter {
// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
// 通用模式：obj.setXxx(value) → obj.xxx = value // 通用模式：obj.setXxx(value) → obj.xxx = value
// 匹配: (对象).set(首字母大写的属性名)((参数)) // 支持链式调用：obj.method().setXxx(value) 或 obj.setXxx(value)
tsCode = tsCode.replace(/(\w+)\.set([A-Z]\w*)\(([^)]+)\)/g, (match, obj, property, value) => { // 匹配: (对象或表达式).set(首字母大写的属性名)((参数))
tsCode = tsCode.replace(/([\w.()]+)\.set([A-Z]\w*)\(([^)]+)\)/g, (match, obj, property, value) => {
// 将首字母转换为小写 // 将首字母转换为小写
const propertyName = property.charAt(0).toLowerCase() + property.slice(1); const propertyName = property.charAt(0).toLowerCase() + property.slice(1);
return `${obj}.${propertyName} = ${value}`; return `${obj}.${propertyName} = ${value}`;

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

@@ -23,7 +23,7 @@ export class AddonDevelopServiceImplService {
try { try {
// 获取已安装的插件 // 获取已安装的插件
const installAddonList: Record<String, InstallAddonListVo> = this.coreAddonService.getInstallAddonList(); const installAddonList: Record<String, InstallAddonListVo> = this.coreAddonService.installAddonList;
// 获取本地所有的插件 // 获取本地所有的插件
const localAddons: string[] = fs.readdirSync(this.appConfig.webRootDownAddon) const localAddons: string[] = fs.readdirSync(this.appConfig.webRootDownAddon)
@@ -36,7 +36,7 @@ export class AddonDevelopServiceImplService {
const info: Record<string, any> = JsonUtils.parseObject<any>(JsonUtils.parseObject<any>(fs.readFileSync(path.join(file, "info.json"), 'utf-8'))); const info: Record<string, any> = JsonUtils.parseObject<any>(JsonUtils.parseObject<any>(fs.readFileSync(path.join(file, "info.json"), 'utf-8')));
const addon: string = info.getStr("key"); const addon: string = info.getStr("key");
const addonDevelopListVo: AddonDevelopListVo = Object.assign(new AddonDevelopListVo(), info) /* TODO: 检查AddonDevelopListVo构造函数 */; const addonDevelopListVo: AddonDevelopListVo = Object.assign(new AddonDevelopListVo(), info) /* TODO: 检查AddonDevelopListVo构造函数 */;
if (installAddonList.get(addon) != null) addonDevelopListVo.setInstallInfo(installAddonList.get(addon)); if (installAddonList.get(addon) != null) addonDevelopListVo.installInfo = installAddonList.get(addon);
addonDevelopListVo.icon = fs.readFileSync(file + "/resource/icon.png", 'base64'); addonDevelopListVo.icon = fs.readFileSync(file + "/resource/icon.png", 'base64');
addonDevelopListVo.cover = fs.readFileSync(file + "/resource/cover.png", 'base64'); addonDevelopListVo.cover = fs.readFileSync(file + "/resource/cover.png", 'base64');
list.push(addonDevelopListVo); list.push(addonDevelopListVo);
@@ -94,7 +94,7 @@ export class AddonDevelopServiceImplService {
model.icon = param.icon; model.icon = param.icon;
model.key = param.key; model.key = param.key;
model.type = param.type; model.type = param.type;
model.supportApp = param.getSupportApp(); model.supportApp = param.supportApp;
this.coreAddonService.set(model); this.coreAddonService.set(model);
} }
} }

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

@@ -26,21 +26,21 @@ export class AddonServiceImplService {
const list: Record<String, LocalAddonInfoVo> = new const installAddonList: Record<>(); const list: Record<String, LocalAddonInfoVo> = new const installAddonList: Record<>();
// 获取已安装的插件 // 获取已安装的插件
Record<String, InstallAddonListVo> = this.this.CoreAddonService.getInstallAddonList(); Record<String, InstallAddonListVo> = this.this.CoreAddonService.installAddonList;
try { try {
const moduleList: ModuleListVo[] = this.niucloudService.getModuleList(); const moduleList: ModuleListVo[] = this.niucloudService.moduleList;
for (const item of moduleList) { for (const item of moduleList) {
ModuleListVo.const app: App = item.getApp(); ModuleListVo.const app: App = item.app;
const addonInfoVo: LocalAddonInfoVo = new LocalAddonInfoVo(); const addonInfoVo: LocalAddonInfoVo = new LocalAddonInfoVo();
addonInfoVo.title = app.appName; addonInfoVo.title = app.appName;
addonInfoVo.desc = app.appDesc; addonInfoVo.desc = app.appDesc;
addonInfoVo.key = app.appKey; addonInfoVo.key = app.appKey;
addonInfoVo.setAuthor(item.getSiteName()); addonInfoVo.author = item.siteName;
addonInfoVo.version = item.version; addonInfoVo.version = item.version;
addonInfoVo.setIsLocal(false); addonInfoVo.isLocal = false;
addonInfoVo.setIsDownload(false); addonInfoVo.isDownload = false;
addonInfoVo.type = app.appType; addonInfoVo.type = app.appType;
addonInfoVo.icon = app.appLogo; addonInfoVo.icon = app.appLogo;
addonInfoVo.cover = app.windowLogo[0]; addonInfoVo.cover = app.windowLogo[0];
@@ -59,18 +59,18 @@ export class AddonServiceImplService {
const addon: string = info.getStr("key"); const addon: string = info.getStr("key");
if (list.get(addon) != null) { if (list.get(addon) != null) {
const addonInfoVo: LocalAddonInfoVo = list.get(addon); const addonInfoVo: LocalAddonInfoVo = list.get(addon);
addonInfoVo.setIsDownload(true); addonInfoVo.isDownload = true;
addonInfoVo.setIsLocal(false); addonInfoVo.isLocal = false;
if (installAddonList.get(addon) != null) { if (installAddonList.get(addon) != null) {
addonInfoVo.setInstallInfo(installAddonList.get(addon)); addonInfoVo.installInfo = installAddonList.get(addon);
} }
list.put(addon, addonInfoVo); list.put(addon, addonInfoVo);
} else { } else {
const localAddonInfoVo: LocalAddonInfoVo = Object.assign(new LocalAddonInfoVo(), info) /* TODO: 检查LocalAddonInfoVo构造函数 */; const localAddonInfoVo: LocalAddonInfoVo = Object.assign(new LocalAddonInfoVo(), info) /* TODO: 检查LocalAddonInfoVo构造函数 */;
localAddonInfoVo.setIsLocal(true); localAddonInfoVo.isLocal = true;
localAddonInfoVo.setIsDownload(true); localAddonInfoVo.isDownload = true;
if (installAddonList.get(addon) != null) if (installAddonList.get(addon) != null)
localAddonInfoVo.setInstallInfo(installAddonList.get(addon)); localAddonInfoVo.installInfo = installAddonList.get(addon);
localAddonInfoVo.icon = fs.readFileSync(file + "/resource/icon.png", 'base64'); localAddonInfoVo.icon = fs.readFileSync(file + "/resource/icon.png", 'base64');
localAddonInfoVo.cover = fs.readFileSync(file + "/resource/cover.png", 'base64'); localAddonInfoVo.cover = fs.readFileSync(file + "/resource/cover.png", 'base64');
list.put(addon, localAddonInfoVo); list.put(addon, localAddonInfoVo);
@@ -82,7 +82,7 @@ export class AddonServiceImplService {
vo.error = e.message; vo.error = e.message;
} }
vo.setList(list); vo.list = list;
return vo; return vo;
} }
@@ -126,13 +126,13 @@ export class AddonServiceImplService {
const model: Addon = new Addon(); const model: Addon = new Addon();
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
model.setInstallTime(addonParam.getInstallTime()); model.installTime = addonParam.installTime;
model.updateTime = Date.now( / 1000); model.updateTime = Date.now( / 1000);
model.cover = addonParam.cover; model.cover = addonParam.cover;
model.type = addonParam.type; model.type = addonParam.type;
model.supportApp = addonParam.getSupportApp(); model.supportApp = addonParam.supportApp;
model.setIsStar(addonParam.getIsStar()); model.isStar = addonParam.isStar;
model.setCompile(String.join(",", addonParam.getCompile())); model.compile = String.join(",", addonParam.compile);
// BeanUtil.copyProperties(sysPositionEditParam, sysPosition); // BeanUtil.copyProperties(sysPositionEditParam, sysPosition);
this.addonRepository.save(model); this.addonRepository.save(model);
} }
@@ -155,7 +155,7 @@ export class AddonServiceImplService {
* getInstallTask * getInstallTask
*/ */
async getInstallTask(): Promise<any> { async getInstallTask(): Promise<any> {
return this.this.CoreAddonInstallService.getInstallTask(); return this.this.CoreAddonInstallService.installTask;
} }
/** /**
@@ -223,16 +223,16 @@ export class AddonServiceImplService {
* download * download
*/ */
async download(addon: string, version: string): Promise<any> { async download(addon: string, version: string): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.getInstance(); const instance: NiucloudUtils = NiucloudUtils.instance;
const actionQuery: Record<String, Object> = new const query: Record<>(); const actionQuery: Record<String, Object> = new const query: Record<>();
actionQuery.put("data[app_key]", addon); actionQuery.put("data[app_key]", addon);
actionQuery.put("data[version]", version); actionQuery.put("data[version]", version);
actionQuery.put("data[product_key]", instance.getProductKey()); actionQuery.put("data[product_key]", instance.productKey);
const actionToken: Record<string, any> = this.niucloudService.getActionToken("download", actionQuery); const actionToken: Record<string, any> = this.niucloudService.getActionToken("download", actionQuery);
Record<String, Object> = {}; Record<String, Object> = {};
query.put("authorize_code", instance.getCode()); query.put("authorize_code", instance.code);
query.put("addon_name", addon); query.put("addon_name", addon);
query.put("version", version); query.put("version", version);
query.put("token", actionToken == null ? "" : actionToken.getStr("token")); query.put("token", actionToken == null ? "" : actionToken.getStr("token"));
@@ -263,10 +263,10 @@ export class AddonServiceImplService {
*/ */
async getIndexAddonList(param: IndexAddonListParam): Promise<any> { async getIndexAddonList(param: IndexAddonListParam): Promise<any> {
const params: Record<String, Object> = {}; const params: Record<String, Object> = {};
const config: NiucloudConfigVo = this.coreNiucloudConfigService.getNiucloudConfig(); const config: NiucloudConfigVo = this.coreNiucloudConfigService.niucloudConfig;
params.put("code", config.getAuthCode()); params.put("code", config.authCode);
params.put("secret", config.getAuthSecret()); params.put("secret", config.authSecret);
params.put("labels", param.getLabelId()); params.put("labels", param.labelId);
params.put("product_key", "sass"); params.put("product_key", "sass");
params.put("is_recommend", 1); params.put("is_recommend", 1);
params.put("order_field", "sale_num desc, visit_num desc"); params.put("order_field", "sale_num desc, visit_num desc");

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

@@ -22,6 +22,6 @@ export class AliappConfigServiceImplService {
* setAliappConfig * setAliappConfig
*/ */
async setAliappConfig(aliappConfigParam: AliappConfigParam): Promise<any> { async setAliappConfig(aliappConfigParam: AliappConfigParam): Promise<any> {
this.coreAliappConfigService.setAliappConfig(this.requestContext.siteId, aliappConfigParam); this.coreAliappConfigService.aliappConfig = this.requestContext.siteId, aliappConfigParam;
} }
} }

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

@@ -38,7 +38,7 @@ export class AuthServiceImplService {
throw new UnauthorizedException("NO_SITE_PERMISSION", 400); throw new UnauthorizedException("NO_SITE_PERMISSION", 400);
} }
} }
RequestUtils.setAppType(siteinfo.appType); RequestUtils.appType = siteinfo.appType;
} }
/** /**
@@ -52,8 +52,8 @@ export class AuthServiceImplService {
return superAdminUid === uid; return superAdminUid === uid;
} else { } else {
const sysUserRole: SysUserRole = this.sysUserRoleRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("is_admin", 1).last(" limit 1")); const sysUserRole: SysUserRole = this.sysUserRoleRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("is_admin", 1).last(" limit 1"));
cached.tag("adminAuth").put("superAdminUid", sysUserRole.getUid()); cached.tag("adminAuth").put("superAdminUid", sysUserRole.uid);
return sysUserRole.getUid() === uid; return sysUserRole.uid === uid;
} }
} }
@@ -62,16 +62,16 @@ export class AuthServiceImplService {
*/ */
async checkRole(request: HttpServletRequest): Promise<any> { async checkRole(request: HttpServletRequest): Promise<any> {
//当前访问的路由地址 //当前访问的路由地址
const rule: string = RequestUtils.getReqeustURI(); const rule: string = RequestUtils.reqeustURI;
const method: string = RequestUtils.getRequestMethod(); const method: string = RequestUtils.requestMethod;
//缓存站点信息数据 //缓存站点信息数据
const siteinfo: SiteInfoVo = this.siteService.info(this.requestContext.siteId); const siteinfo: SiteInfoVo = this.siteService.info(this.requestContext.siteId);
if (method !== "get") { if (method !== "get") {
if (siteinfo.status === SiteStatusEnum.EXPIRE.getCode()) { if (siteinfo.status === SiteStatusEnum.EXPIRE.code) {
throw new UnauthorizedException("站点已打烊，续费后可继续使用此项功能", 400); throw new UnauthorizedException("站点已打烊，续费后可继续使用此项功能", 400);
} }
if (siteinfo.status === SiteStatusEnum.CLOSE.getCode()) { if (siteinfo.status === SiteStatusEnum.CLOSE.code) {
throw new UnauthorizedException("站点已停止", 400); throw new UnauthorizedException("站点已停止", 400);
} }
} }
@@ -89,7 +89,7 @@ export class AuthServiceImplService {
throw new UnauthorizedException("NO_PERMISSION", 400); throw new UnauthorizedException("NO_PERMISSION", 400);
} }
} }
Map<String, String[]> roleMenuList = this.getAuthApiList(); Map<String, String[]> roleMenuList = this.authApiList;
/*if(roleMenuList.get(method).size()<=0 || roleMenuList.get(method).indexOf(rule)<=0){ /*if(roleMenuList.get(method).size()<=0 || roleMenuList.get(method).indexOf(rule)<=0){
throw new UnauthorizedException("NO_PERMISSION"); throw new UnauthorizedException("NO_PERMISSION");
}*/ }*/
@@ -99,7 +99,7 @@ export class AuthServiceImplService {
* checkIsDemo * checkIsDemo
*/ */
async checkIsDemo(request: HttpServletRequest): Promise<any> { async checkIsDemo(request: HttpServletRequest): Promise<any> {
const method: string = RequestUtils.getRequestMethod(); const method: string = RequestUtils.requestMethod;
if (method !== "get" && this.appConfig.isDemo) { if (method !== "get" && this.appConfig.isDemo) {
throw new BadRequestException("演示环境不允许操作"); throw new BadRequestException("演示环境不允许操作");
@@ -124,12 +124,12 @@ export class AuthServiceImplService {
if (ObjectUtil.isNull(sysUserRoleInfoVo)) { if (ObjectUtil.isNull(sysUserRoleInfoVo)) {
return new JSONArray(); return new JSONArray();
} }
isAdmin = sysUserRoleInfoVo.getIsAdmin();//是否是超级管理员 isAdmin = sysUserRoleInfoVo.isAdmin;//是否是超级管理员
} }
if (isAdmin > 0) { if (isAdmin > 0) {
menuList = this.sysMenuService.getMenuListByCondition(appType, siteId, 1, 0, [], addon); menuList = this.sysMenuService.getMenuListByCondition(appType, siteId, 1, 0, [], addon);
} else { } else {
const roleIdList: string[] = JSONUtil.toList(JSONUtil.parseArray(sysUserRoleInfoVo.getRoleIds()), String.class); const roleIdList: string[] = JSONUtil.toList(JSONUtil.parseArray(sysUserRoleInfoVo.roleIds), String.class);
const menuKeyList: string[] = this.sysRoleService.getMenuIdsByRoleIds(siteId, roleIdList); const menuKeyList: string[] = this.sysRoleService.getMenuIdsByRoleIds(siteId, roleIdList);
menuList = this.sysMenuService.getMenuListByCondition(appType, siteId, 100, 0, menuKeyList, addon); menuList = this.sysMenuService.getMenuListByCondition(appType, siteId, 100, 0, menuKeyList, addon);
} }
@@ -158,7 +158,7 @@ export class AuthServiceImplService {
// const authUserInfoVo: AuthUserInfoVo = sysUserRoleMapper.selectJoinOne(AuthUserInfoVo.class, userRoleMPJQueryWrapper); // const authUserInfoVo: AuthUserInfoVo = sysUserRoleMapper.selectJoinOne(AuthUserInfoVo.class, userRoleMPJQueryWrapper);
// if(ObjectUtil.isNotNull(authUserInfoVo)) // if(ObjectUtil.isNotNull(authUserInfoVo))
// { // {
// authUserInfoVo.setStatusName(""); // authUserInfoVo.statusName = "";
// } // }
// //
// return authUserInfoVo; // return authUserInfoVo;
@@ -168,16 +168,16 @@ export class AuthServiceImplService {
* editAuth * editAuth
*/ */
async editAuth(editAuthUserParam: EditAuthUserParam): Promise<any> { async editAuth(editAuthUserParam: EditAuthUserParam): Promise<any> {
if (ObjectUtil.isNotNull(editAuthUserParam.getPassword()) && CommonUtils.isNotEmpty(editAuthUserParam.getPassword())) { if (ObjectUtil.isNotNull(editAuthUserParam.password) && CommonUtils.isNotEmpty(editAuthUserParam.password)) {
const sysUser: SysUser = this.sysUserService.find(RequestUtils.uid()); const sysUser: SysUser = this.sysUserService.find(RequestUtils.uid());
if (!PasswordEncipher.matche(editAuthUserParam.getOriginalPassword(), sysUser.getPassword())) { if (!PasswordEncipher.matche(editAuthUserParam.originalPassword, sysUser.password)) {
throw new UnauthorizedException("OLD_PASSWORD_ERROR"); throw new UnauthorizedException("OLD_PASSWORD_ERROR");
} }
} }
const sysUserParam: SysUserParam = new SysUserParam(); const sysUserParam: SysUserParam = new SysUserParam();
sysUserParam.setHeadImg(editAuthUserParam.getHeadImg()); sysUserParam.headImg = editAuthUserParam.headImg;
sysUserParam.setRealName(editAuthUserParam.getRealName()); sysUserParam.realName = editAuthUserParam.realName;
sysUserParam.setPassword(editAuthUserParam.getPassword()); sysUserParam.password = editAuthUserParam.password;
this.sysUserService.edit(RequestUtils.uid(), sysUserParam); this.sysUserService.edit(RequestUtils.uid(), sysUserParam);
} }
@@ -185,19 +185,19 @@ export class AuthServiceImplService {
* addUserLog * addUserLog
*/ */
async addUserLog(request: HttpServletRequest): Promise<any> { async addUserLog(request: HttpServletRequest): Promise<any> {
if (RequestUtils.getRequestMethod() === "get") return; if (RequestUtils.requestMethod === "get") return;
try { try {
const model: SysUserLog = new SysUserLog(); const model: SysUserLog = new SysUserLog();
model.siteId = this.requestContext.siteId; model.siteId = this.requestContext.siteId;
model.setUid(RequestUtils.uid()); model.uid = RequestUtils.uid();
model.setIp(RequestUtils.ip()); model.ip = RequestUtils.ip();
model.setUsername(StpUtil.getExtra("userName").toString()); model.username = StpUtil.getExtra("userName".toString());
model.url = RequestUtils.getReqeustURI(); model.url = RequestUtils.reqeustURI;
model.setParams("{}"); model.params = "{}";
model.type = RequestUtils.getRequestMethod(); model.type = RequestUtils.requestMethod;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
model.setOperation(getDescription(request)); model.operation = getDescription(request);
this.sysUserLogRepository.save(model); this.sysUserLogRepository.save(model);
} catch (e) { } catch (e) {
} }
@@ -207,6 +207,6 @@ export class AuthServiceImplService {
* setIsAllowChangeSite * setIsAllowChangeSite
*/ */
async setIsAllowChangeSite(param: Map<String, param: Integer>): Promise<any> { async setIsAllowChangeSite(param: Map<String, param: Integer>): Promise<any> {
this.coreConfigService.setConfig(0,"IS_ALLOW_CHANGE_SITE", JsonUtils.parseObject<any>(param)); this.coreConfigService.config = 0,"IS_ALLOW_CHANGE_SITE", JsonUtils.parseObject<any>(param);
} }
} }

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

@@ -26,10 +26,10 @@ export class ConfigServiceImplService {
*/ */
async setLoginConfig(loginConfigParam: LoginConfigParam): Promise<any> { async setLoginConfig(loginConfigParam: LoginConfigParam): Promise<any> {
const jsonObject: Record<string, any> = new Record<string, any>(); const jsonObject: Record<string, any> = new Record<string, any>();
jsonObject.set("is_captcha", loginConfigParam.getIsCaptcha()); jsonObject.set("is_captcha", loginConfigParam.isCaptcha);
jsonObject.set("is_site_captcha", loginConfigParam.getIsSiteCaptcha()); jsonObject.set("is_site_captcha", loginConfigParam.isSiteCaptcha);
jsonObject.set("bg", loginConfigParam.getBg()); jsonObject.set("bg", loginConfigParam.bg);
jsonObject.set("site_bg", loginConfigParam.getSiteBg()); jsonObject.set("site_bg", loginConfigParam.siteBg);
this.coreConfigService.setConfig(this.requestContext.siteId, ConfigKeyEnum.path.basename(ADMIN_LOGIN), jsonObject); this.coreConfigService.config = this.requestContext.siteId, ConfigKeyEnum.path.basename(ADMIN_LOGIN, jsonObject);
} }
} }

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

@@ -17,26 +17,26 @@ export class LoginServiceImplService {
*/ */
async login(userLoginParam: UserLoginParam): Promise<any> { async login(userLoginParam: UserLoginParam): Promise<any> {
const appType: string = userLoginParam.appType; const appType: string = userLoginParam.appType;
const userName: string = userLoginParam.getUsername(); const userName: string = userLoginParam.username;
const passWord: string = userLoginParam.getPassword(); const passWord: string = userLoginParam.password;
if(!EnumUtils.isInclude(appType, AppTypeEnum.class, "getName")){ if(!EnumUtils.isInclude(appType, AppTypeEnum.class, "getName")){
throw new UnauthorizedException("APP_TYPE_NOT_EXIST"); throw new UnauthorizedException("APP_TYPE_NOT_EXIST");
} }
const siteId: number = this.requestContext.siteId; const siteId: number = this.requestContext.siteId;
const loginConfigVo: LoginConfigVo = this.configService.getLoginConfig(); const loginConfigVo: LoginConfigVo = this.configService.loginConfig;
const isCaptcha: number = 0; const isCaptcha: number = 0;
if(appType === AppTypeEnum.path.basename(ADMIN)){ if(appType === AppTypeEnum.path.basename(ADMIN)){
isCaptcha=loginConfigVo.getIsCaptcha(); isCaptcha=loginConfigVo.isCaptcha;
}else if(appType === AppTypeEnum.path.basename(SITE)){ }else if(appType === AppTypeEnum.path.basename(SITE)){
isCaptcha=loginConfigVo.getIsSiteCaptcha(); isCaptcha=loginConfigVo.isSiteCaptcha;
} }
if(isCaptcha==1){ if(isCaptcha==1){
//验证验证码 //验证验证码
const captchaVO: CaptchaVO = new CaptchaVO(); const captchaVO: CaptchaVO = new CaptchaVO();
captchaVO.setCaptchaVerification(userLoginParam.getCaptchaCode()); captchaVO.captchaVerification = userLoginParam.captchaCode;
this.coreCaptchaImgService.verification(captchaVO); this.coreCaptchaImgService.verification(captchaVO);
} }
const userInfo: SysUserInfoVo = this.sysUserService.getUserInfoByUserName(userName); const userInfo: SysUserInfoVo = this.sysUserService.getUserInfoByUserName(userName);
@@ -45,18 +45,18 @@ export class LoginServiceImplService {
} }
//检测密码加密是否正确 //检测密码加密是否正确
if(!PasswordEncipher.matche(passWord, userInfo.getPassword())){ if(!PasswordEncipher.matche(passWord, userInfo.password)){
throw new UnauthorizedException("账号密码错误"); throw new UnauthorizedException("账号密码错误");
} }
//设置当前登录用户id //设置当前登录用户id
RequestUtils.setUid(userInfo.getUid()); RequestUtils.uid = userInfo.uid;
const defaultSiteId: number = 0; const defaultSiteId: number = 0;
const roleInfoVo: SysUserRoleInfoVo = new SysUserRoleInfoVo(); const roleInfoVo: SysUserRoleInfoVo = new SysUserRoleInfoVo();
const siteIds: number[] = []; const siteIds: number[] = [];
if(appType === AppTypeEnum.path.basename(ADMIN)){ if(appType === AppTypeEnum.path.basename(ADMIN)){
defaultSiteId=RequestUtils.defaultSiteId(); defaultSiteId=RequestUtils.defaultSiteId();
roleInfoVo=this.sysUserRoleService.getUserRole(defaultSiteId, userInfo.getUid()); roleInfoVo=this.sysUserRoleService.getUserRole(defaultSiteId, userInfo.uid);
if(ObjectUtil.isNotNull(roleInfoVo)){ if(ObjectUtil.isNotNull(roleInfoVo)){
if(userInfo.status<=0){ if(userInfo.status<=0){
throw new UnauthorizedException("账号被锁定"); throw new UnauthorizedException("账号被锁定");
@@ -65,7 +65,7 @@ export class LoginServiceImplService {
appType=AppTypeEnum.path.basename(SITE); appType=AppTypeEnum.path.basename(SITE);
} }
}else if(appType === AppTypeEnum.path.basename(SITE)){ }else if(appType === AppTypeEnum.path.basename(SITE)){
siteIds=this.authSiteService.getSiteIds(); siteIds=this.authSiteService.siteIds;
if(ObjectUtil.isNotNull(siteIds) && siteIds.length>0){ if(ObjectUtil.isNotNull(siteIds) && siteIds.length>0){
defaultSiteId=siteIds.indexOf(this.requestContext.siteId)>0 || this.authService.isSuperAdmin()?this.requestContext.siteId:siteIds.get(0); defaultSiteId=siteIds.indexOf(this.requestContext.siteId)>0 || this.authService.isSuperAdmin()?this.requestContext.siteId:siteIds.get(0);
} }
@@ -74,41 +74,41 @@ export class LoginServiceImplService {
} }
//修改用户登录信息 //修改用户登录信息
this.sysUserService.editUserLoginInfo(userInfo.getUid()); this.sysUserService.editUserLoginInfo(userInfo.uid);
const loginModel: SaLoginModel = SaLoginModel.create(); const loginModel: SaLoginModel = SaLoginModel.create();
loginModel.setDevice(RequestUtils.handler().getHeader("User-Agent")); loginModel.device = RequestUtils.handler(.getHeader("User-Agent"));
loginModel.setExtra("userName", userInfo.getUsername()); loginModel.extra = "userName", userInfo.username;
loginModel.setExtra("headImg", userInfo.getHeadImg()); loginModel.extra = "headImg", userInfo.headImg;
loginModel.setExtra("realName", userInfo.getRealName()); loginModel.extra = "realName", userInfo.realName;
// 执行登录 // 执行登录
StpUtil.login("user-" + userInfo.getUid(), loginModel); StpUtil.login("user-" + userInfo.uid, loginModel);
// 获取返回内容 // 获取返回内容
const saTokenInfo: SaTokenInfo = StpUtil.getTokenInfo(); const saTokenInfo: SaTokenInfo = StpUtil.tokenInfo;
const resultVo: LoginResultVo = new LoginResultVo(); const resultVo: LoginResultVo = new LoginResultVo();
const userInfoVo: LoginUserInfoVo = new LoginUserInfoVo(); const userInfoVo: LoginUserInfoVo = new LoginUserInfoVo();
userInfoVo.setUid(userInfo.getUid()); userInfoVo.uid = userInfo.uid;
userInfoVo.setUsername(userInfo.getUsername()); userInfoVo.username = userInfo.username;
userInfoVo.setHeadImg(userInfo.getHeadImg()); userInfoVo.headImg = userInfo.headImg;
userInfoVo.setIsSuperAdmin(this.authService.isSuperAdmin()); userInfoVo.isSuperAdmin = this.authService.isSuperAdmin();
if(appType === AppTypeEnum.path.basename(ADMIN) || (appType === AppTypeEnum.path.basename(SITE) && defaultSiteId>0)){ if(appType === AppTypeEnum.path.basename(ADMIN) || (appType === AppTypeEnum.path.basename(SITE) && defaultSiteId>0)){
RequestUtils.siteId = defaultSiteId; RequestUtils.siteId = defaultSiteId;
const siteInfoVo: SiteInfoVo = this.siteService.info(this.requestContext.siteId); const siteInfoVo: SiteInfoVo = this.siteService.info(this.requestContext.siteId);
resultVo.setSiteInfo(siteInfoVo); resultVo.siteInfo = siteInfoVo;
} }
if(appType === AppTypeEnum.path.basename(ADMIN) && !userInfoVo.getIsSuperAdmin()){ if(appType === AppTypeEnum.path.basename(ADMIN) && !userInfoVo.isSuperAdmin){
siteIds=this.authSiteService.getSiteIds(); siteIds=this.authSiteService.siteIds;
} }
resultVo.setToken(saTokenInfo.getTokenValue()); resultVo.token = saTokenInfo.tokenValue;
resultVo.setExpiresTime(DateUtils.currTime()+saTokenInfo.getTokenTimeout()); resultVo.expiresTime = DateUtils.currTime(+saTokenInfo.tokenTimeout);
resultVo.setUserinfo(userInfoVo); resultVo.userinfo = userInfoVo;
resultVo.siteId = defaultSiteId; resultVo.siteId = defaultSiteId;
resultVo.setUserrole(roleInfoVo); resultVo.userrole = roleInfoVo;
userInfoVo.setSiteIds(siteIds); userInfoVo.siteIds = siteIds;
return resultVo; return resultVo;
} }

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

@@ -27,7 +27,7 @@ export class AdminAppServiceImplService {
* setAppConfig * setAppConfig
*/ */
async setAppConfig(param: SetAppParam): Promise<any> { async setAppConfig(param: SetAppParam): Promise<any> {
this.coreAppService.setConfig(this.requestContext.siteId, param); this.coreAppService.config = this.requestContext.siteId, param;
} }
/** /**
@@ -39,8 +39,8 @@ export class AdminAppServiceImplService {
any /* TODO: QueryWrapper<AppVersion> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<AppVersion> */ queryWrapper = new QueryWrapper();
queryWrapper.eq("site_id", this.requestContext.siteId); queryWrapper.eq("site_id", this.requestContext.siteId);
if (param.getPlatform() != null) { if (param.platform != null) {
queryWrapper.eq("platform", param.getPlatform()); queryWrapper.eq("platform", param.platform);
} }
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time");
@@ -87,7 +87,7 @@ export class AdminAppServiceImplService {
.orderByDesc("id") .orderByDesc("id")
.last("limit 1") .last("limit 1")
); );
if (lastVersion != null && number.valueOf(param.getVersionCode()) <= number.valueOf(lastVersion.getVersionCode())) { if (lastVersion != null && number.valueOf(param.versionCode) <= number.valueOf(lastVersion.versionCode)) {
throw new BadRequestException("版本号必须高于上一版本设置的值"); throw new BadRequestException("版本号必须高于上一版本设置的值");
} }
@@ -96,8 +96,8 @@ export class AdminAppServiceImplService {
BeanUtil.copyProperties(param, appVersion); BeanUtil.copyProperties(param, appVersion);
appVersion.createTime = DateUtils.currTime(); appVersion.createTime = DateUtils.currTime();
if (param.getPackageType() === "cloud") { if (param.packageType === "cloud") {
appVersion.setTaskKey(this.coreAppCloudService.appCloudBuid(param)); appVersion.taskKey = this.coreAppCloudService.appCloudBuid(param);
appVersion.status = AppDict.StatusEnum.STATUS_CREATING.value; appVersion.status = AppDict.StatusEnum.STATUS_CREATING.value;
} else { } else {
appVersion.status = AppDict.StatusEnum.STATUS_UPLOAD_SUCCESS.value; appVersion.status = AppDict.StatusEnum.STATUS_UPLOAD_SUCCESS.value;
@@ -120,16 +120,16 @@ export class AdminAppServiceImplService {
.orderByDesc("id") .orderByDesc("id")
.last("limit 1") .last("limit 1")
); );
if (lastVersion != null && number.valueOf(param.getVersionCode()) <= number.valueOf(lastVersion.getVersionCode())) { if (lastVersion != null && number.valueOf(param.versionCode) <= number.valueOf(lastVersion.versionCode)) {
throw new BadRequestException("版本号必须高于上一版本设置的值"); throw new BadRequestException("版本号必须高于上一版本设置的值");
} }
BeanUtil.copyProperties(param, appVersion); BeanUtil.copyProperties(param, appVersion);
appVersion.updateTime = DateUtils.currTime(); appVersion.updateTime = DateUtils.currTime();
if (param.getPackageType() === "cloud") { if (param.packageType === "cloud") {
param.siteId = this.requestContext.siteId; param.siteId = this.requestContext.siteId;
appVersion.setTaskKey(this.coreAppCloudService.appCloudBuid(param)); appVersion.taskKey = this.coreAppCloudService.appCloudBuid(param);
appVersion.status = AppDict.StatusEnum.STATUS_CREATING.value; appVersion.status = AppDict.StatusEnum.STATUS_CREATING.value;
} else { } else {
appVersion.status = AppDict.StatusEnum.STATUS_UPLOAD_SUCCESS.value; appVersion.status = AppDict.StatusEnum.STATUS_UPLOAD_SUCCESS.value;
@@ -157,7 +157,7 @@ export class AdminAppServiceImplService {
.eq("site_id", this.requestContext.siteId) .eq("site_id", this.requestContext.siteId)
.set("status", AppDict.StatusEnum.STATUS_CREATE_FAIL.value) .set("status", AppDict.StatusEnum.STATUS_CREATE_FAIL.value)
.set("update_time", DateUtils.currTime()) .set("update_time", DateUtils.currTime())
.set("fail_reason", ObjectUtil.defaultIfNull(vo.getFailReason(), "") )); .set("fail_reason", ObjectUtil.defaultIfNull(vo.failReason, "") ));
} }
if (vo.status === "success") { if (vo.status === "success") {
this.appVersionRepository.save(null, new UpdateWrapper<AppVersion>() this.appVersionRepository.save(null, new UpdateWrapper<AppVersion>()
@@ -165,7 +165,7 @@ export class AdminAppServiceImplService {
.eq("site_id", this.requestContext.siteId) .eq("site_id", this.requestContext.siteId)
.set("status", AppDict.StatusEnum.STATUS_UPLOAD_SUCCESS.value) .set("status", AppDict.StatusEnum.STATUS_UPLOAD_SUCCESS.value)
.set("update_time", DateUtils.currTime()) .set("update_time", DateUtils.currTime())
.set("package_path", vo.getFilePath() )); .set("package_path", vo.filePath ));
} }
return vo; return vo;
} }
@@ -185,7 +185,7 @@ export class AdminAppServiceImplService {
const model: AppVersion = new AppVersion(); const model: AppVersion = new AppVersion();
model.id = appVersion.id; model.id = appVersion.id;
appVersion.status = AppDict.StatusEnum.STATUS_PUBLISHED.value; appVersion.status = AppDict.StatusEnum.STATUS_PUBLISHED.value;
appVersion.setReleaseTime(DateUtils.currTime()); appVersion.releaseTime = DateUtils.currTime();
return appVersionMapper.updateById(appVersion) > 0; return appVersionMapper.updateById(appVersion) > 0;
} }

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

@@ -63,8 +63,8 @@ export class DictServiceImplService {
const model: SysDict = new SysDict(); const model: SysDict = new SysDict();
model.name = path.basename(addParam); model.name = path.basename(addParam);
model.key = addParam.key; model.key = addParam.key;
model.setMemo(addParam.getMemo()); model.memo = addParam.memo;
model.setDictionary("[]"); model.dictionary = "[]";
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
model.updateTime = Date.now( / 1000); model.updateTime = Date.now( / 1000);
this.dictRepository.save(model); this.dictRepository.save(model);
@@ -82,7 +82,7 @@ export class DictServiceImplService {
model.id = id; model.id = id;
model.name = path.basename(editParam); model.name = path.basename(editParam);
model.key = editParam.key; model.key = editParam.key;
model.setMemo(editParam.getMemo()); model.memo = editParam.memo;
model.updateTime = Date.now( / 1000); model.updateTime = Date.now( / 1000);
dictMapper.updateById(model); dictMapper.updateById(model);
} }

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

@@ -15,7 +15,7 @@ export class DiyConfigServiceImplService {
* getBottomList * getBottomList
*/ */
async getBottomList(): Promise<any> { async getBottomList(): Promise<any> {
return this.coreDiyConfigService.getBottomList(); return this.coreDiyConfigService.bottomList;
} }
/** /**
@@ -29,6 +29,6 @@ export class DiyConfigServiceImplService {
* setBottomConfig * setBottomConfig
*/ */
async setBottomConfig(param: SetBottomConfigParam): Promise<any> { async setBottomConfig(param: SetBottomConfigParam): Promise<any> {
this.coreDiyConfigService.setBottomConfig(this.requestContext.siteId, param.value, param.key); this.coreDiyConfigService.bottomConfig = this.requestContext.siteId, param.value, param.key;
} }
} }

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

@@ -18,7 +18,7 @@ export class DiyRouteServiceImplService {
* list * list
*/ */
async list(searchParam: DiyRouteSearchParam): Promise<any[]> { async list(searchParam: DiyRouteSearchParam): Promise<any[]> {
const linkEnum: Record<string, any> = LinkEnum.getLink(); const linkEnum: Record<string, any> = LinkEnum.link;
const routerList: DiyRouteListVo[] = []; const routerList: DiyRouteListVo[] = [];
const sort: number = 0; const sort: number = 0;

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

@@ -33,24 +33,24 @@ export class DiyServiceImplService {
queryWrapper.orderByDesc("id"); queryWrapper.orderByDesc("id");
if (CommonUtils.isNotEmpty(searchParam.title)) queryWrapper.like("title", searchParam.title); if (CommonUtils.isNotEmpty(searchParam.title)) queryWrapper.like("title", searchParam.title);
if (CommonUtils.isNotEmpty(searchParam.getMode())) queryWrapper.eq("mode", searchParam.getMode()); if (CommonUtils.isNotEmpty(searchParam.mode)) queryWrapper.eq("mode", searchParam.mode);
if (CommonUtils.isNotEmpty(searchParam.type)) queryWrapper.eq("type", searchParam.type); if (CommonUtils.isNotEmpty(searchParam.type)) queryWrapper.eq("type", searchParam.type);
const template: Record<string, any> = TemplateEnum.getTemplate(); const template: Record<string, any> = TemplateEnum.template;
List<Record<String, Object>> templateAddon = TemplateEnum.getTemplateAddons((this.requestContext.siteId)); List<Record<String, Object>> templateAddon = TemplateEnum.getTemplateAddons((this.requestContext.siteId));
[DiyPage[], number] iPage = this.diyPageRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); [DiyPage[], number] iPage = this.diyPageRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
const list: DiyPageListVo[] = []; const list: DiyPageListVo[] = [];
for (const item of iPageRecords) { for (const item of iPageRecords) {
const vo: DiyPageListVo = new DiyPageListVo(); const vo: DiyPageListVo = new DiyPageListVo();
Object.assign(vo, item); Object.assign(vo, item);
vo.setTypeName(ObjectUtil.defaultIfNull(template.getByPath(vo.type + ".title", String.class), "")); vo.typeName = ObjectUtil.defaultIfNull(template.getByPath(vo.type + ".title", String.class, ""));
vo.setTypePage(ObjectUtil.defaultIfNull(template.getByPath(vo.type + ".page", String.class), "")); vo.typePage = ObjectUtil.defaultIfNull(template.getByPath(vo.type + ".page", String.class, ""));
const addonName: string = templateAddon const addonName: string = templateAddon
.filter(temp => vo.type != null && vo.type === temp.get("type")) .filter(temp => vo.type != null && vo.type === temp.get("type"))
.findFirst() .findFirst()
.map(addon => ObjectUtil.defaultIfNull(addon.get("title"), "").toString()) .map(addon => ObjectUtil.defaultIfNull(addon.get("title"), "").toString())
.orElse(""); .orElse("");
vo.setAddonName(addonName); vo.addonName = addonName;
list.push(vo); list.push(vo);
} }
return PageResult.build(page, limit, iPageTotal).setData(list); return PageResult.build(page, limit, iPageTotal).setData(list);
@@ -65,7 +65,7 @@ export class DiyServiceImplService {
queryWrapper.orderByDesc("id"); queryWrapper.orderByDesc("id");
if (CommonUtils.isNotEmpty(searchParam.title)) queryWrapper.like("title", searchParam.title); if (CommonUtils.isNotEmpty(searchParam.title)) queryWrapper.like("title", searchParam.title);
if (CommonUtils.isNotEmpty(searchParam.getMode())) queryWrapper.eq("mode", searchParam.getMode()); if (CommonUtils.isNotEmpty(searchParam.mode)) queryWrapper.eq("mode", searchParam.mode);
if (CommonUtils.isNotEmpty(searchParam.type)) { if (CommonUtils.isNotEmpty(searchParam.type)) {
const type: string[] = Arrays.stream(searchParam.type); const type: string[] = Arrays.stream(searchParam.type);
queryWrapper.in("type", type); queryWrapper.in("type", type);
@@ -153,11 +153,11 @@ export class DiyServiceImplService {
if (!model) throw new BadRequestException("页面不存在!"); if (!model) throw new BadRequestException("页面不存在!");
const update: DiyPage = new DiyPage(); const update: DiyPage = new DiyPage();
update.setIsDefault(0); update.isDefault = 0;
this.diyPageRepository.save(update, /* TODO: any /* TODO: QueryWrapper<DiyPage> */需改写为TypeORM的where条件对象 */.eq("name", path.basename(model)).eq("site_id", this.requestContext.siteId)); this.diyPageRepository.save(update, /* TODO: any /* TODO: QueryWrapper<DiyPage> */需改写为TypeORM的where条件对象 */.eq("name", path.basename(model)).eq("site_id", this.requestContext.siteId));
update.id = id; update.id = id;
update.setIsDefault(1); update.isDefault = 1;
update.updateTime = Date.now( / 1000); update.updateTime = Date.now( / 1000);
diyPageMapper.updateById(update); diyPageMapper.updateById(update);
} }
@@ -166,7 +166,7 @@ export class DiyServiceImplService {
* getLink * getLink
*/ */
async getLink(): Promise<any> { async getLink(): Promise<any> {
const linkEnum: Record<string, any> = LinkEnum.getLink(); const linkEnum: Record<string, any> = LinkEnum.link;
for (const key of linkEnum.keySet()) { for (const key of linkEnum.keySet()) {
const item: Record<string, any> = linkEnum.getRecord<string, any>(key); const item: Record<string, any> = linkEnum.getRecord<string, any>(key);
@@ -196,7 +196,7 @@ export class DiyServiceImplService {
for (const diyPage of pageList) { for (const diyPage of pageList) {
const child: Record<string, any> = new Record<string, any>(); const child: Record<string, any> = new Record<string, any>();
child.put("name", path.basename(diyPage)); child.put("name", path.basename(diyPage));
child.put("title", diyPage.getPageTitle()); child.put("title", diyPage.pageTitle);
child.put("url", "/app/pages/index/diy?id=" + diyPage.id); child.put("url", "/app/pages/index/diy?id=" + diyPage.id);
newChildList.push(child); newChildList.push(child);
} }
@@ -225,7 +225,7 @@ export class DiyServiceImplService {
if (StringUtils.isNotBlank(path.basename(param))) { if (StringUtils.isNotBlank(path.basename(param))) {
const startConfig: StartUpPageConfigVo = this.coreDiyConfigService.getStartUpPageConfig(this.requestContext.siteId, path.basename(param)); const startConfig: StartUpPageConfigVo = this.coreDiyConfigService.getStartUpPageConfig(this.requestContext.siteId, path.basename(param));
if (startConfig != null) { if (startConfig != null) {
if ("DIY_PAGE".equals(startConfig.getParent())) { if ("DIY_PAGE".equals(startConfig.parent)) {
const page: string = startConfig.page; const page: string = startConfig.page;
const id: number = number.parseInt(page.replace("/app/pages/index/diy?id=", "")); const id: number = number.parseInt(page.replace("/app/pages/index/diy?id=", ""));
info = this.info(id); info = this.info(id);
@@ -253,8 +253,8 @@ export class DiyServiceImplService {
if (info != null) { if (info != null) {
if (template.getRecord<string, any>(info.type) != null) { if (template.getRecord<string, any>(info.type) != null) {
const page: Record<string, any> = template.getRecord<string, any>(info.type); const page: Record<string, any> = template.getRecord<string, any>(info.type);
info.setTypeName(page.getStr("title")); info.typeName = page.getStr("title");
info.setPage(page.getStr("page")); info.page = page.getStr("page");
} }
} else { } else {
const time: number = Date.now() / 1000; const time: number = Date.now() / 1000;
@@ -305,19 +305,19 @@ export class DiyServiceImplService {
info = new DiyPageInfoVo(); info = new DiyPageInfoVo();
info.name = name; info.name = name;
info.setPageTitle(pageTitle); // 页面名称（用于后台展示） info.pageTitle = pageTitle; // 页面名称（用于后台展示）
info.title = title; // 页面标题（用于前台展示） info.title = title; // 页面标题（用于前台展示）
info.type = type; info.type = type;
info.setTypeName(typeName); info.typeName = typeName;
info.setTemplate(templateName); info.template = templateName;
info.setPage(pageRoute); info.page = pageRoute;
info.setMode(mode); info.mode = mode;
info.value = value; info.value = value;
info.setIsDefault(isDefault); info.isDefault = isDefault;
} }
info.setComponent(getComponentList(info.type)); info.component = getComponentList(info.type);
info.setDomainUrl(this.coreSysConfigService.getSceneDomain(this.requestContext.siteId)); info.domainUrl = this.coreSysConfigService.getSceneDomain(this.requestContext.siteId);
// 处理全局模板数据 // 处理全局模板数据
const diyTemplate: Record<string, any> = new Record<string, any>(); const diyTemplate: Record<string, any> = new Record<string, any>();
@@ -328,7 +328,7 @@ export class DiyServiceImplService {
diyTemplate = getTemplate(templateParam); diyTemplate = getTemplate(templateParam);
if (diyTemplate != null && diyTemplate.containsKey(path.basename(info))) { if (diyTemplate != null && diyTemplate.containsKey(path.basename(info))) {
const templateInfo: Record<string, any> = diyTemplate.getRecord<string, any>(path.basename(info)); const templateInfo: Record<string, any> = diyTemplate.getRecord<string, any>(path.basename(info));
info.setGlobal(templateInfo.getRecord<string, any>("global")); info.global = templateInfo.getRecord<string, any>("global");
} }
} }
@@ -339,7 +339,7 @@ export class DiyServiceImplService {
* getComponentList * getComponentList
*/ */
async getComponentList(name: string): Promise<any> { async getComponentList(name: string): Promise<any> {
const data: Record<string, any> = ComponentEnum.getComponent(); const data: Record<string, any> = ComponentEnum.component;
// 安全遍历顶层数据 // 安全遍历顶层数据
Iterator<String> categoryIterator = data.keySet().iterator(); Iterator<String> categoryIterator = data.keySet().iterator();
@@ -409,7 +409,7 @@ export class DiyServiceImplService {
const template: Record<string, any> = TemplateEnum.getTemplate(param); const template: Record<string, any> = TemplateEnum.getTemplate(param);
for (const key of template.keySet()) { for (const key of template.keySet()) {
const pages: Record<string, any> = ObjectUtil.defaultIfNull(PagesEnum.getPages(key, param.getMode()), new Record<string, any>()); const pages: Record<string, any> = ObjectUtil.defaultIfNull(PagesEnum.getPages(key, param.mode), new Record<string, any>());
template.putByPath(key + ".template", pages); template.putByPath(key + ".template", pages);
} }
//删除null值 防止序列化报错 //删除null值 防止序列化报错
@@ -421,7 +421,7 @@ export class DiyServiceImplService {
* changeTemplate * changeTemplate
*/ */
async changeTemplate(value: StartUpPageConfigParam): Promise<any> { async changeTemplate(value: StartUpPageConfigParam): Promise<any> {
this.this.coreDiyConfigService.setStartUpPageConfig(this.requestContext.siteId, value, value.type); this.this.coreDiyConfigService.startUpPageConfig = this.requestContext.siteId, value, value.type;
} }
/** /**
@@ -456,7 +456,7 @@ export class DiyServiceImplService {
useTemplate.set("page", startConfig.page); useTemplate.set("page", startConfig.page);
useTemplate.set("action", startConfig.action); useTemplate.set("action", startConfig.action);
useTemplate.set("url", startConfig.page); useTemplate.set("url", startConfig.page);
useTemplate.set("parent", startConfig.getParent()); useTemplate.set("parent", startConfig.parent);
} else if (info != null) { } else if (info != null) {
useTemplate.set("id", info.id); useTemplate.set("id", info.id);
useTemplate.set("title", info.title); useTemplate.set("title", info.title);
@@ -475,7 +475,7 @@ export class DiyServiceImplService {
const route: DiyRouteListVo = otherPage.get(0); const route: DiyRouteListVo = otherPage.get(0);
useTemplate.set("title", route.title); useTemplate.set("title", route.title);
useTemplate.set("name", path.basename(route)); useTemplate.set("name", path.basename(route));
useTemplate.set("parent", route.getParent()); useTemplate.set("parent", route.parent);
useTemplate.set("action", route.action); useTemplate.set("action", route.action);
} }
@@ -483,9 +483,9 @@ export class DiyServiceImplService {
const sceneDomain: SceneDomainVo = this.coreSysConfigService.getSceneDomain(this.requestContext.siteId); const sceneDomain: SceneDomainVo = this.coreSysConfigService.getSceneDomain(this.requestContext.siteId);
const domainUrl: Record<string, any> = new Record<string, any>(); const domainUrl: Record<string, any> = new Record<string, any>();
domainUrl.put("wap_domain", sceneDomain.getWapDomain()); domainUrl.put("wap_domain", sceneDomain.wapDomain);
domainUrl.put("wap_url", sceneDomain.getWapUrl()); domainUrl.put("wap_url", sceneDomain.wapUrl);
domainUrl.put("web_url", sceneDomain.getWebUrl()); domainUrl.put("web_url", sceneDomain.webUrl);
template.put("domain_url", domainUrl); template.put("domain_url", domainUrl);
return template; return template;
@@ -531,9 +531,9 @@ export class DiyServiceImplService {
const template: Record<string, any> = getTemplate(templateParam).getRecord<string, any>(param.key); const template: Record<string, any> = getTemplate(templateParam).getRecord<string, any>(param.key);
if (template == null) return; if (template == null) return;
if (!param.getAddon().isEmpty()) { if (!param.addon.isEmpty()) {
const addonTemplateParam: TemplateParam = new TemplateParam(); const addonTemplateParam: TemplateParam = new TemplateParam();
addonTemplateParam.setAddon(param.getAddon()); addonTemplateParam.addon = param.addon;
addonTemplateParam.type = param.type; addonTemplateParam.type = param.type;
const addonTemplate: Record<string, any> = getTemplate(addonTemplateParam); const addonTemplate: Record<string, any> = getTemplate(addonTemplateParam);
if (addonTemplate != null && (addonTemplate && addonTemplate.length > 0)) { if (addonTemplate != null && (addonTemplate && addonTemplate.length > 0)) {
@@ -557,14 +557,14 @@ export class DiyServiceImplService {
RequestUtils.siteId = param.siteId; RequestUtils.siteId = param.siteId;
const addParam: DiyPageParam = new DiyPageParam(); const addParam: DiyPageParam = new DiyPageParam();
addParam.title = page.getStr("title", ""); addParam.title = page.getStr("title", "");
addParam.setPageTitle(page.getStr("title", "")); addParam.pageTitle = page.getStr("title", "");
addParam.name = addonFlag; addParam.name = addonFlag;
addParam.type = addonFlag; addParam.type = addonFlag;
addParam.setTemplate(pageKey); addParam.template = pageKey;
addParam.value = page.getRecord<string, any>("data".toString()); addParam.value = page.getRecord<string, any>("data".toString());
addParam.setMode(page.getStr("mode", "")); addParam.mode = page.getStr("mode", "");
addParam.setIsDefault(1); addParam.isDefault = 1;
addParam.setIsChange(0); addParam.isChange = 0;
this.push(addParam); this.push(addParam);
} else { } else {
if (path.basename(info) === "DIY_INDEX" && info.type === "DIY_INDEX") { if (path.basename(info) === "DIY_INDEX" && info.type === "DIY_INDEX") {
@@ -575,13 +575,13 @@ export class DiyServiceImplService {
} }
} }
if (param.getIsStart() === 1) { if (param.isStart === 1) {
const startPage: StartUpPageConfigParam = new StartUpPageConfigParam(); const startPage: StartUpPageConfigParam = new StartUpPageConfigParam();
startPage.type = param.key; startPage.type = param.key;
startPage.setMode(page.getStr("mode", "")); startPage.mode = page.getStr("mode", "");
startPage.title = page.getStr("title", ""); startPage.title = page.getStr("title", "");
startPage.action = template.getStr("action", ""); startPage.action = template.getStr("action", "");
startPage.setPage(template.getStr("page")); startPage.page = template.getStr("page");
this.changeTemplate(startPage); this.changeTemplate(startPage);
} }
} }
@@ -594,10 +594,10 @@ export class DiyServiceImplService {
if (page == null) throw new BadRequestException("页面不存在"); if (page == null) throw new BadRequestException("页面不存在");
page.id = null; page.id = null;
page.setPageTitle(page.getPageTitle() + "_副本"); page.pageTitle = page.pageTitle + "_副本";
page.setIsChange(0); page.isChange = 0;
page.setIsDefault(0); page.isDefault = 0;
page.setShare(""); page.share = "";
page.createTime = Date.now( / 1000); page.createTime = Date.now( / 1000);
this.diyPageRepository.save(page); this.diyPageRepository.save(page);
} }
@@ -646,9 +646,9 @@ export class DiyServiceImplService {
setParam.siteId = siteId; setParam.siteId = siteId;
setParam.type = "index"; setParam.type = "index";
setParam.key = "DIY_INDEX"; setParam.key = "DIY_INDEX";
setParam.setIsStart(isStart); setParam.isStart = isStart;
setParam.setMainApp(addon); setParam.mainApp = addon;
setParam.setAddon(v); setParam.addon = v;
setDiyData(setParam); setDiyData(setParam);
setParam.type = "member_index"; setParam.type = "member_index";
@@ -676,7 +676,7 @@ export class DiyServiceImplService {
for (const item of iPageRecords) { for (const item of iPageRecords) {
const vo: DiyPageListVo = new DiyPageListVo(); const vo: DiyPageListVo = new DiyPageListVo();
Object.assign(vo, item); Object.assign(vo, item);
vo.setTypeName(templates.getByPath(item.type + ".title", String.class)); vo.typeName = templates.getByPath(item.type + ".title", String.class);
list.push(vo); list.push(vo);
} }
return PageResult.build(page, limit, iPageTotal).setData(list); return PageResult.build(page, limit, iPageTotal).setData(list);

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

@@ -23,7 +23,7 @@ export class DiyThemeServiceImplService {
const themeDataList: DiyTheme[] = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("type", "app").eq("is_selected", 1)); const themeDataList: DiyTheme[] = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("type", "app").eq("is_selected", 1));
const themeData: Record<String, DiyTheme> = {}; const themeData: Record<String, DiyTheme> = {};
if ((themeDataList && themeDataList.length > 0)){ if ((themeDataList && themeDataList.length > 0)){
themeData = themeDataList.collect(/* Collectors已删除 */.toMap(theme => theme.getAddon(), theme => theme)); themeData = themeDataList.collect(/* Collectors已删除 */.toMap(theme => theme.addon, theme => theme));
} }
const systemTheme: Record<string, any> = this.coreDiyService.getDefaultThemeColor("app"); const systemTheme: Record<string, any> = this.coreDiyService.getDefaultThemeColor("app");
@@ -46,8 +46,8 @@ export class DiyThemeServiceImplService {
appTheme.putOpt("app", appThemeObj); appTheme.putOpt("app", appThemeObj);
const data: Record<string, any> = new Record<string, any>(); const data: Record<string, any> = new Record<string, any>();
const appsAndAddons: Addon[] = siteCache.getApps(); const appsAndAddons: Addon[] = siteCache.apps;
appsAndAddons.addAll(siteCache.getSiteAddons()); appsAndAddons.addAll(siteCache.siteAddons);
for (const value of appsAndAddons) { for (const value of appsAndAddons) {
const addonTheme: Record<string, any> = this.coreDiyService.getDefaultThemeColor(value.key); const addonTheme: Record<string, any> = this.coreDiyService.getDefaultThemeColor(value.key);
if ((addonTheme && addonTheme.length > 0) && addonTheme.containsKey("theme_color")) { if ((addonTheme && addonTheme.length > 0) && addonTheme.containsKey("theme_color")) {
@@ -70,7 +70,7 @@ export class DiyThemeServiceImplService {
} }
} }
if ((!data || data.length === 0) || siteCache.getApps().size() > 1) { if ((!data || data.length === 0) || siteCache.apps.size() > 1) {
const mergedData: Record<string, any> = new Record<string, any>(); const mergedData: Record<string, any> = new Record<string, any>();
for (const key of appTheme.keySet()) { for (const key of appTheme.keySet()) {
mergedData.putOpt(key, appTheme.get(key)); mergedData.putOpt(key, appTheme.get(key));
@@ -104,29 +104,29 @@ export class DiyThemeServiceImplService {
const saveData: DiyTheme = new DiyTheme(); const saveData: DiyTheme = new DiyTheme();
saveData.siteId = siteId; saveData.siteId = siteId;
saveData.type = "addon"; saveData.type = "addon";
saveData.setAddon(addon.key); saveData.addon = addon.key;
saveData.title = diyTheme.title; saveData.title = diyTheme.title;
saveData.setTheme(data.getTheme().toString()); saveData.theme = data.theme.toString();
saveData.setNewTheme(data.getNewTheme().toString()); saveData.newTheme = data.newTheme.toString();
saveData.setIsSelected(1); saveData.isSelected = 1;
saveData.updateTime = Date.now( / 1000); saveData.updateTime = Date.now( / 1000);
addonSaveData.push(saveData); addonSaveData.push(saveData);
} }
} }
this.diyThemeRepository.save(null, new UpdateWrapper<DiyTheme>().eq("site_id", siteId).eq("addon", data.getAddon()).eq("type", "addon").set("is_selected", 0)); this.diyThemeRepository.save(null, new UpdateWrapper<DiyTheme>().eq("site_id", siteId).eq("addon", data.addon).eq("type", "addon").set("is_selected", 0));
const model: DiyTheme = new DiyTheme(); const model: DiyTheme = new DiyTheme();
Object.assign(model, data); Object.assign(model, data);
model.setIsSelected(1); model.isSelected = 1;
model.updateTime = Date.now( / 1000); model.updateTime = Date.now( / 1000);
diyThemeMapper.updateById(model); diyThemeMapper.updateById(model);
if (!CommonUtils.isNotEmpty(addonSaveData)) { if (!CommonUtils.isNotEmpty(addonSaveData)) {
for (const saveData of addonSaveData) { for (const saveData of addonSaveData) {
this.diyThemeRepository.save(null, new UpdateWrapper<DiyTheme>().eq("site_id", siteId).eq("addon", saveData.getAddon()).eq("type", "addon").set("is_selected", 0)); this.diyThemeRepository.save(null, new UpdateWrapper<DiyTheme>().eq("site_id", siteId).eq("addon", saveData.addon).eq("type", "addon").set("is_selected", 0));
this.diyThemeRepository.save(saveData, new UpdateWrapper<DiyTheme>().eq("site_id", siteId).eq("addon", saveData.getAddon()).eq("type", "addon").eq("title", saveData.title)); this.diyThemeRepository.save(saveData, new UpdateWrapper<DiyTheme>().eq("site_id", siteId).eq("addon", saveData.addon).eq("type", "addon").eq("title", saveData.title));
} }
} }
} }
@@ -135,15 +135,15 @@ export class DiyThemeServiceImplService {
* getDefaultThemeColor * getDefaultThemeColor
*/ */
async getDefaultThemeColor(data: DiyThemeColorParam): Promise<any> { async getDefaultThemeColor(data: DiyThemeColorParam): Promise<any> {
const addon: string = data.getAddon(); const addon: string = data.addon;
const themeList: DiyTheme[] = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("addon", addon)); const themeList: DiyTheme[] = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("addon", addon));
const voList: DiyThemeInfoVo[] = []; const voList: DiyThemeInfoVo[] = [];
for (const theme of themeList) { for (const theme of themeList) {
const vo: DiyThemeInfoVo = new DiyThemeInfoVo(); const vo: DiyThemeInfoVo = new DiyThemeInfoVo();
Object.assign(vo, theme); Object.assign(vo, theme);
const addonTheme: Record<string, any> = this.coreDiyService.getDefaultThemeColor(theme.getAddon()); const addonTheme: Record<string, any> = this.coreDiyService.getDefaultThemeColor(theme.addon);
if ((addonTheme && addonTheme.length > 0) && addonTheme.containsKey("theme_field")) { if ((addonTheme && addonTheme.length > 0) && addonTheme.containsKey("theme_field")) {
vo.setThemeField(addonTheme.getJSONArray("theme_field")); vo.themeField = addonTheme.getJSONArray("theme_field");
} }
voList.push(vo); voList.push(vo);
} }
@@ -163,13 +163,13 @@ export class DiyThemeServiceImplService {
const diyTheme: DiyTheme = new DiyTheme(); const diyTheme: DiyTheme = new DiyTheme();
diyTheme.siteId = siteId; diyTheme.siteId = siteId;
diyTheme.setTheme("addon"); diyTheme.theme = "addon";
diyTheme.setAddon(addon.key); diyTheme.addon = addon.key;
diyTheme.title = data.title; diyTheme.title = data.title;
diyTheme.setTheme(data.getTheme().toString()); diyTheme.theme = data.theme.toString();
diyTheme.setNewTheme(data.getNewTheme().toString()); diyTheme.newTheme = data.newTheme.toString();
diyTheme.setDefaultTheme(data.getDefaultTheme().toString()); diyTheme.defaultTheme = data.defaultTheme.toString();
diyTheme.setThemeType("diy"); diyTheme.themeType = "diy";
diyTheme.createTime = Date.now( / 1000); diyTheme.createTime = Date.now( / 1000);
addonSaveData.push(diyTheme); addonSaveData.push(diyTheme);
} }
@@ -178,7 +178,7 @@ export class DiyThemeServiceImplService {
const model: DiyTheme = new DiyTheme(); const model: DiyTheme = new DiyTheme();
Object.assign(model, data); Object.assign(model, data);
model.type = "app"; model.type = "app";
model.setThemeType("diy"); model.themeType = "diy";
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
addonSaveData.push(model); addonSaveData.push(model);
if (CommonUtils.isNotEmpty(addonSaveData)) { if (CommonUtils.isNotEmpty(addonSaveData)) {
@@ -204,8 +204,8 @@ export class DiyThemeServiceImplService {
saveData.id = diyTheme.id; saveData.id = diyTheme.id;
saveData.siteId = diyTheme.siteId; saveData.siteId = diyTheme.siteId;
saveData.title = diyTheme.title; saveData.title = diyTheme.title;
saveData.setTheme(data.getTheme().toString()); saveData.theme = data.theme.toString();
saveData.setNewTheme(data.getNewTheme().toString()); saveData.newTheme = data.newTheme.toString();
saveData.updateTime = Date.now( / 1000); saveData.updateTime = Date.now( / 1000);
addonSaveData.push(saveData); addonSaveData.push(saveData);
@@ -231,7 +231,7 @@ export class DiyThemeServiceImplService {
if (CommonUtils.isEmpty(diyThemeInfo)) { if (CommonUtils.isEmpty(diyThemeInfo)) {
throw new BadRequestException("主题色不存在"); throw new BadRequestException("主题色不存在");
} }
if (diyThemeInfo.getThemeType() === "default") { if (diyThemeInfo.themeType === "default") {
throw new BadRequestException("默认主题色不能删除"); throw new BadRequestException("默认主题色不能删除");
} }
this.diyThemeRepository.delete(diyThemeInfo); this.diyThemeRepository.delete(diyThemeInfo);
@@ -243,7 +243,7 @@ export class DiyThemeServiceImplService {
async checkDiyThemeTitleUnique(data: DiyThemeTitleParam): Promise<any> { async checkDiyThemeTitleUnique(data: DiyThemeTitleParam): Promise<any> {
any /* TODO: QueryWrapper<DiyTheme> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<DiyTheme> */ queryWrapper = new QueryWrapper();
queryWrapper.eq("title", data.title); queryWrapper.eq("title", data.title);
queryWrapper.eq("addon", data.getAddon()); queryWrapper.eq("addon", data.addon);
if(CommonUtils.isNotEmpty(data.id)) if(CommonUtils.isNotEmpty(data.id))
{ {
queryWrapper.ne("id", data.id); queryWrapper.ne("id", data.id);

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

@@ -43,7 +43,7 @@ export class DiyFormRecordsServiceImplService {
for (const vo of iPageRecords) { for (const vo of iPageRecords) {
const memberVo: Member = new Member(); const memberVo: Member = new Member();
Object.assign(memberVo, vo); Object.assign(memberVo, vo);
vo.setMember(memberVo); vo.member = memberVo;
} }
return PageResult.build(iPage); return PageResult.build(iPage);
} }
@@ -53,19 +53,19 @@ export class DiyFormRecordsServiceImplService {
*/ */
async getFieldStatList(searchParam: DiyFormRecordsSearchParam): Promise<any> { async getFieldStatList(searchParam: DiyFormRecordsSearchParam): Promise<any> {
const diyFormRecordsFieldsSearchParam: DiyFormRecordsFieldsSearchParam = new DiyFormRecordsFieldsSearchParam(); const diyFormRecordsFieldsSearchParam: DiyFormRecordsFieldsSearchParam = new DiyFormRecordsFieldsSearchParam();
diyFormRecordsFieldsSearchParam.setFormId(searchParam.formId); diyFormRecordsFieldsSearchParam.formId = searchParam.formId;
const fieldsList: DiyFormFieldsListVo[] = this.diyFormService.getFieldsList(diyFormRecordsFieldsSearchParam); const fieldsList: DiyFormFieldsListVo[] = this.diyFormService.getFieldsList(diyFormRecordsFieldsSearchParam);
// 过滤简单字段列表 // 过滤简单字段列表
const simpleTypes: string[] = {"FormRadio", "FormCheckbox", "FormDateScope", "FormTimeScope", "FormImage"}; const simpleTypes: string[] = {"FormRadio", "FormCheckbox", "FormDateScope", "FormTimeScope", "FormImage"};
const simpleFieldList: DiyFormFieldsListVo[] = fieldsList const simpleFieldList: DiyFormFieldsListVo[] = fieldsList
.filter(e => ![simpleTypes].includes(e.getFieldType())) .filter(e => ![simpleTypes].includes(e.fieldType))
; ;
// 过滤 JSON 字段列表 // 过滤 JSON 字段列表
const jsonTypes: string[] = {"FormRadio", "FormCheckbox", "FormDateScope", "FormTimeScope"}; const jsonTypes: string[] = {"FormRadio", "FormCheckbox", "FormDateScope", "FormTimeScope"};
const jsonFieldList: DiyFormFieldsListVo[] = fieldsList const jsonFieldList: DiyFormFieldsListVo[] = fieldsList
.filter(e => [jsonTypes].includes(e.getFieldType())) .filter(e => [jsonTypes].includes(e.fieldType))
; ;
const totalCount: number = 0; const totalCount: number = 0;
@@ -73,8 +73,8 @@ export class DiyFormRecordsServiceImplService {
// 统计每个字段值的填写数量 // 统计每个字段值的填写数量
any /* TODO: QueryWrapper<DiyFormRecordsFields> */ valueQueryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<DiyFormRecordsFields> */ valueQueryWrapper = new QueryWrapper();
valueQueryWrapper.eq("site_id", this.requestContext.siteId) valueQueryWrapper.eq("site_id", this.requestContext.siteId)
.eq("field_key", field.getFieldKey()) .eq("field_key", field.fieldKey)
.eq("field_type", field.getFieldType()); .eq("field_type", field.fieldType);
if (searchParam.formId != null) { if (searchParam.formId != null) {
valueQueryWrapper.eq("form_id", searchParam.formId); valueQueryWrapper.eq("form_id", searchParam.formId);
} }
@@ -91,7 +91,7 @@ export class DiyFormRecordsServiceImplService {
{ {
try{ try{
Class<?> clazz = ClassLoaderUtil.loadClass(driver); Class<?> clazz = ClassLoaderUtil.loadClass(driver);
const obj: Object = clazz.getDeclaredConstructor().newInstance(); const obj: Object = clazz.declaredConstructor.newInstance();
const method: Method = clazz.getMethod("render", String.class, String.class); const method: Method = clazz.getMethod("render", String.class, String.class);
value.put("render_value", method.invoke(obj, value.get("field_value").toString(), value.get("field_type").toString())); value.put("render_value", method.invoke(obj, value.get("field_value").toString(), value.get("field_type").toString()));
}catch (e){ }catch (e){
@@ -106,8 +106,8 @@ export class DiyFormRecordsServiceImplService {
// 计算总数量 // 计算总数量
totalCount = this.diyFormRecordsFieldsRepository.count({ /* TODO: 将QueryWrapper改为where条件 */ })) totalCount = this.diyFormRecordsFieldsRepository.count({ /* TODO: 将QueryWrapper改为where条件 */ }))
.eq("field_key", field.getFieldKey()) .eq("field_key", field.fieldKey)
.eq("field_type", field.getFieldType())); .eq("field_type", field.fieldType));
if (totalCount > 0) { if (totalCount > 0) {
const totalPercent: number = 100; const totalPercent: number = 100;
@@ -123,7 +123,7 @@ export class DiyFormRecordsServiceImplService {
totalPercent = totalPercent - itemPercent; totalPercent = totalPercent - itemPercent;
} }
} }
field.setValueList(valueList); field.valueList = valueList;
} }
// 处理 JSON 字段列表 // 处理 JSON 字段列表
@@ -131,8 +131,8 @@ export class DiyFormRecordsServiceImplService {
// 查询字段记录 // 查询字段记录
any /* TODO: QueryWrapper<DiyFormRecordsFields> */ fieldQueryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<DiyFormRecordsFields> */ fieldQueryWrapper = new QueryWrapper();
fieldQueryWrapper.eq("site_id", this.requestContext.siteId) fieldQueryWrapper.eq("site_id", this.requestContext.siteId)
.eq("field_key", field.getFieldKey()) .eq("field_key", field.fieldKey)
.eq("field_type", field.getFieldType()); .eq("field_type", field.fieldType);
if (searchParam.formId != null) { if (searchParam.formId != null) {
fieldQueryWrapper.eq("form_id", searchParam.formId); fieldQueryWrapper.eq("form_id", searchParam.formId);
} }
@@ -147,7 +147,7 @@ export class DiyFormRecordsServiceImplService {
{ {
try{ try{
Class<?> clazz = ClassLoaderUtil.loadClass(driver); Class<?> clazz = ClassLoaderUtil.loadClass(driver);
const obj: Object = clazz.getDeclaredConstructor().newInstance(); const obj: Object = clazz.declaredConstructor.newInstance();
const method: Method = clazz.getMethod("render", String.class, String.class); const method: Method = clazz.getMethod("render", String.class, String.class);
value.put("render_value", method.invoke(obj, value.get("field_value").toString(), value.get("field_type").toString())); value.put("render_value", method.invoke(obj, value.get("field_value").toString(), value.get("field_type").toString()));
}catch (e){ }catch (e){
@@ -204,7 +204,7 @@ export class DiyFormRecordsServiceImplService {
value.put("write_percent", itemPercent); value.put("write_percent", itemPercent);
totalPercent = totalPercent - itemPercent; totalPercent = totalPercent - itemPercent;
} }
field.setValueList(valueList); field.valueList = valueList;
} }
} }

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

@@ -44,8 +44,8 @@ export class DiyFormServiceImplService {
queryWrapper.eq("type", searchParam.type); queryWrapper.eq("type", searchParam.type);
} }
if (CommonUtils.isNotEmpty(searchParam.getAddon())) { if (CommonUtils.isNotEmpty(searchParam.addon)) {
queryWrapper.eq("addon", searchParam.getAddon()); queryWrapper.eq("addon", searchParam.addon);
} }
queryWrapper.orderByDesc("form_id"); queryWrapper.orderByDesc("form_id");
@@ -80,8 +80,8 @@ export class DiyFormServiceImplService {
queryWrapper.eq("type", searchParam.type); queryWrapper.eq("type", searchParam.type);
} }
if (CommonUtils.isNotEmpty(searchParam.getAddon())) { if (CommonUtils.isNotEmpty(searchParam.addon)) {
queryWrapper.eq("addon", searchParam.getAddon()); queryWrapper.eq("addon", searchParam.addon);
} }
if (CommonUtils.isNotEmpty(searchParam.status)) { if (CommonUtils.isNotEmpty(searchParam.status)) {
queryWrapper.eq("status", searchParam.status); queryWrapper.eq("status", searchParam.status);
@@ -136,23 +136,23 @@ export class DiyFormServiceImplService {
async add(addParam: DiyFormParam): Promise<any> { async add(addParam: DiyFormParam): Promise<any> {
const model: DiyForm = new DiyForm(); const model: DiyForm = new DiyForm();
model.setPageTitle(addParam.getPageTitle()); model.pageTitle = addParam.pageTitle;
model.title = addParam.title; model.title = addParam.title;
model.type = addParam.type; model.type = addParam.type;
model.status = 1; model.status = 1;
model.setTemplate(addParam.getTemplate()); model.template = addParam.template;
model.value = addParam.value; model.value = addParam.value;
const diyFormTypeEnum: DiyFormTypeEnum = new DiyFormTypeEnum(); const diyFormTypeEnum: DiyFormTypeEnum = new DiyFormTypeEnum();
const type: Record<string, any> = diyFormTypeEnum.getType(addParam.type); const type: Record<string, any> = diyFormTypeEnum.getType(addParam.type);
if(type.containsKey("addon")) if(type.containsKey("addon"))
{ {
model.setAddon(type.getStr("addon")); model.addon = type.getStr("addon");
}else{ }else{
model.setAddon(""); model.addon = "";
} }
model.setShare(addParam.getShare()); model.share = addParam.share;
model.setRemark(addParam.getRemark()); model.remark = addParam.remark;
model.siteId = this.requestContext.siteId; model.siteId = this.requestContext.siteId;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
model.updateTime = Date.now( / 1000); model.updateTime = Date.now( / 1000);
@@ -172,27 +172,27 @@ export class DiyFormServiceImplService {
const fieldRecord: DiyFormFields = new DiyFormFields(); const fieldRecord: DiyFormFields = new DiyFormFields();
fieldRecord.siteId = this.requestContext.siteId; fieldRecord.siteId = this.requestContext.siteId;
fieldRecord.setFormId(model.formId); fieldRecord.formId = model.formId;
fieldRecord.setFieldKey(component.get("id").toString()); fieldRecord.fieldKey = component.get("id".toString());
fieldRecord.setFieldType(componentName); fieldRecord.fieldType = componentName;
fieldRecord.setFieldName(field.containsKey("name") ? field.getStr("name") : ""); fieldRecord.fieldName = field.containsKey("name" ? field.getStr("name") : "");
if(field.containsKey("remark")) if(field.containsKey("remark"))
{ {
const remark: Record<string, any> = field.getRecord<string, any>("remark"); const remark: Record<string, any> = field.getRecord<string, any>("remark");
if(remark.containsKey("text")) if(remark.containsKey("text"))
{ {
fieldRecord.setFieldRemark(remark.getStr("text")); fieldRecord.fieldRemark = remark.getStr("text");
}else{ }else{
fieldRecord.setFieldRemark(""); fieldRecord.fieldRemark = "";
} }
}else{ }else{
fieldRecord.setFieldRemark(""); fieldRecord.fieldRemark = "";
} }
fieldRecord.setFieldDefault(field.containsKey("default") ? field.get("default").toString() : ""); fieldRecord.fieldDefault = field.containsKey("default" ? field.get("default").toString() : "");
fieldRecord.setFieldRequired(field.containsKey("required") ? field.getInt("required") : 0); fieldRecord.fieldRequired = field.containsKey("required" ? field.getInt("required") : 0);
fieldRecord.setFieldHidden(component.getInt("isHidden")); fieldRecord.fieldHidden = component.getInt("isHidden");
fieldRecord.setFieldUnique(field.containsKey("unique") ? field.getInt("unique") : 0); fieldRecord.fieldUnique = field.containsKey("unique" ? field.getInt("unique") : 0);
fieldRecord.setPrivacyProtection(field.containsKey("privacyProtection") ? field.getInt("privacyProtection") : 0); fieldRecord.privacyProtection = field.containsKey("privacyProtection" ? field.getInt("privacyProtection") : 0);
fieldRecord.createTime = Date.now( / 1000); fieldRecord.createTime = Date.now( / 1000);
fieldRecord.updateTime = Date.now( / 1000); fieldRecord.updateTime = Date.now( / 1000);
diyFormFields.push(fieldRecord); diyFormFields.push(fieldRecord);
@@ -204,13 +204,13 @@ export class DiyFormServiceImplService {
const writeParam: DiyFormWriteConfigParam = new DiyFormWriteConfigParam(); const writeParam: DiyFormWriteConfigParam = new DiyFormWriteConfigParam();
writeParam.siteId = this.requestContext.siteId; writeParam.siteId = this.requestContext.siteId;
writeParam.setFormId(model.formId); writeParam.formId = model.formId;
// 初始化表单填写配置 // 初始化表单填写配置
this.coreDiyFormConfigService.addWriteConfig(writeParam); this.coreDiyFormConfigService.addWriteConfig(writeParam);
const submitConfigParam: DiyFormSubmitConfigParam = new DiyFormSubmitConfigParam(); const submitConfigParam: DiyFormSubmitConfigParam = new DiyFormSubmitConfigParam();
submitConfigParam.siteId = this.requestContext.siteId; submitConfigParam.siteId = this.requestContext.siteId;
submitConfigParam.setFormId(model.formId); submitConfigParam.formId = model.formId;
// 初始化表单提交成功页配置 // 初始化表单提交成功页配置
this.coreDiyFormConfigService.addSubmitConfig(submitConfigParam); this.coreDiyFormConfigService.addSubmitConfig(submitConfigParam);
@@ -226,8 +226,8 @@ export class DiyFormServiceImplService {
if (!model) throw new BadRequestException("万能表单不存在"); if (!model) throw new BadRequestException("万能表单不存在");
model.title = editParam.title; model.title = editParam.title;
model.setPageTitle(editParam.getPageTitle()); model.pageTitle = editParam.pageTitle;
model.setTemplate(editParam.getTemplate()); model.template = editParam.template;
model.value = editParam.value; model.value = editParam.value;
model.updateTime = Date.now( / 1000); model.updateTime = Date.now( / 1000);
diyFormMapper.updateById(model); diyFormMapper.updateById(model);
@@ -249,27 +249,27 @@ export class DiyFormServiceImplService {
const fieldRecord: DiyFormFields = new DiyFormFields(); const fieldRecord: DiyFormFields = new DiyFormFields();
fieldRecord.siteId = this.requestContext.siteId; fieldRecord.siteId = this.requestContext.siteId;
fieldRecord.setFormId(model.formId); fieldRecord.formId = model.formId;
fieldRecord.setFieldKey(component.get("id").toString()); fieldRecord.fieldKey = component.get("id".toString());
fieldRecord.setFieldType(componentName); fieldRecord.fieldType = componentName;
fieldRecord.setFieldName(field.containsKey("name") ? field.getStr("name") : ""); fieldRecord.fieldName = field.containsKey("name" ? field.getStr("name") : "");
if(field.containsKey("remark")) if(field.containsKey("remark"))
{ {
const remark: Record<string, any> = field.getRecord<string, any>("remark"); const remark: Record<string, any> = field.getRecord<string, any>("remark");
if(remark.containsKey("text")) if(remark.containsKey("text"))
{ {
fieldRecord.setFieldRemark(remark.getStr("text")); fieldRecord.fieldRemark = remark.getStr("text");
}else{ }else{
fieldRecord.setFieldRemark(""); fieldRecord.fieldRemark = "";
} }
}else{ }else{
fieldRecord.setFieldRemark(""); fieldRecord.fieldRemark = "";
} }
fieldRecord.setFieldDefault(field.containsKey("default") ? field.get("default").toString() : ""); fieldRecord.fieldDefault = field.containsKey("default" ? field.get("default").toString() : "");
fieldRecord.setFieldRequired(field.containsKey("required") ? field.getInt("required") : 0); fieldRecord.fieldRequired = field.containsKey("required" ? field.getInt("required") : 0);
fieldRecord.setFieldHidden(component.getInt("isHidden")); fieldRecord.fieldHidden = component.getInt("isHidden");
fieldRecord.setFieldUnique(field.containsKey("unique") ? field.getInt("unique") : 0); fieldRecord.fieldUnique = field.containsKey("unique" ? field.getInt("unique") : 0);
fieldRecord.setPrivacyProtection(field.containsKey("privacyProtection") ? field.getInt("privacyProtection") : 0); fieldRecord.privacyProtection = field.containsKey("privacyProtection" ? field.getInt("privacyProtection") : 0);
fieldRecord.updateTime = Date.now( / 1000); fieldRecord.updateTime = Date.now( / 1000);
if(formFieldsListMap.containsKey(component.getStr("id"))) if(formFieldsListMap.containsKey(component.getStr("id")))
@@ -306,13 +306,13 @@ export class DiyFormServiceImplService {
//事件检测是否可以被删除 //事件检测是否可以被删除
DiyFormDelBeforeEventDefiner.const event: DiyFormDelBeforeEvent = new DiyFormDelBeforeEventDefiner.DiyFormDelBeforeEvent(); DiyFormDelBeforeEventDefiner.const event: DiyFormDelBeforeEvent = new DiyFormDelBeforeEventDefiner.DiyFormDelBeforeEvent();
for (const formId of formIds) { for (const formId of formIds) {
event.setFormId(formId); event.formId = formId;
event.siteId = this.requestContext.siteId; event.siteId = this.requestContext.siteId;
const result: DiyFormDelBeforeEventDefiner.DiyFromDelBeforeResult[] = EventAndSubscribeOfPublisher.publishAndCallback(event); const result: DiyFormDelBeforeEventDefiner.DiyFromDelBeforeResult[] = EventAndSubscribeOfPublisher.publishAndCallback(event);
for (DiyFormDelBeforeEventDefiner.DiyFromDelBeforeResult res : result) { for (DiyFormDelBeforeEventDefiner.DiyFromDelBeforeResult res : result) {
if(CommonUtils.isNotEmpty(res)) if(CommonUtils.isNotEmpty(res))
{ {
if(!res.getAllowOperate()) throw new BadRequestException("存在正在使用的表单，无法删除"); if(!res.allowOperate) throw new BadRequestException("存在正在使用的表单，无法删除");
} }
} }
} }
@@ -338,7 +338,7 @@ export class DiyFormServiceImplService {
const diyFormTypeEnum: DiyFormTypeEnum = new DiyFormTypeEnum(); const diyFormTypeEnum: DiyFormTypeEnum = new DiyFormTypeEnum();
const currentType: Record<string, any> = diyFormTypeEnum.getType(data.type); const currentType: Record<string, any> = diyFormTypeEnum.getType(data.type);
const typeName: string = currentType.getStr("title"); const typeName: string = currentType.getStr("title");
data.setTypeName(typeName); data.typeName = typeName;
} else { } else {
if (CommonUtils.isEmpty(params.type)) { if (CommonUtils.isEmpty(params.type)) {
throw new BadRequestException("DIY_FORM_TYPE_NOT_EXIST"); throw new BadRequestException("DIY_FORM_TYPE_NOT_EXIST");
@@ -354,19 +354,19 @@ export class DiyFormServiceImplService {
const value: string = ""; const value: string = "";
data = new DiyFormInfoVo(); data = new DiyFormInfoVo();
data.setFormId(0); data.formId = 0;
data.setPageTitle(pageTitle); data.pageTitle = pageTitle;
data.title = typeName; data.title = typeName;
data.type = type; data.type = type;
data.setTypeName(typeName); data.typeName = typeName;
data.value = value; data.value = value;
data.status = 1; data.status = 1;
} }
const initVo: DiyFormInitVo = new DiyFormInitVo(); const initVo: DiyFormInitVo = new DiyFormInitVo();
Object.assign(initVo, data); Object.assign(initVo, data);
initVo.setComponent(getComponentList(data.type)); initVo.component = getComponentList(data.type);
initVo.setDomainUrl(this.systemConfigService.getSceneDomain(this.requestContext.siteId)); initVo.domainUrl = this.systemConfigService.getSceneDomain(this.requestContext.siteId);
return initVo; return initVo;
} }
@@ -375,7 +375,7 @@ export class DiyFormServiceImplService {
*/ */
async modifyShare(formId: number, share: string): Promise<any> { async modifyShare(formId: number, share: string): Promise<any> {
const diyForm: DiyForm = new DiyForm(); const diyForm: DiyForm = new DiyForm();
diyForm.setShare(share); diyForm.share = share;
this.diyFormRepository.save(diyForm, /* TODO: any /* TODO: QueryWrapper<DiyForm> */需改写为TypeORM的where条件对象 */.eq("form_id", formId).eq("site_id", this.requestContext.siteId)); this.diyFormRepository.save(diyForm, /* TODO: any /* TODO: QueryWrapper<DiyForm> */需改写为TypeORM的where条件对象 */.eq("form_id", formId).eq("site_id", this.requestContext.siteId));
return true; return true;
} }
@@ -385,7 +385,7 @@ export class DiyFormServiceImplService {
*/ */
async getComponentList(type: string): Promise<any> { async getComponentList(type: string): Promise<any> {
const formComponentEunm: DiyFormComponentEnum = new DiyFormComponentEnum(); const formComponentEunm: DiyFormComponentEnum = new DiyFormComponentEnum();
const formComponentList: Record<string, any> = formComponentEunm.getComponent(); const formComponentList: Record<string, any> = formComponentEunm.component;
for (const formComponentObj of formComponentList.keySet()) { for (const formComponentObj of formComponentList.keySet()) {
const formComponent: Record<string, any> = formComponentList.getRecord<string, any>(formComponentObj); const formComponent: Record<string, any> = formComponentList.getRecord<string, any>(formComponentObj);
const list: Record<string, any> = formComponent.getRecord<string, any>("list"); const list: Record<string, any> = formComponent.getRecord<string, any>("list");
@@ -438,11 +438,11 @@ export class DiyFormServiceImplService {
// 复制表单信息 // 复制表单信息
const newDiyForm: DiyForm = new DiyForm(); const newDiyForm: DiyForm = new DiyForm();
Object.assign(newDiyForm, diyForm); Object.assign(newDiyForm, diyForm);
newDiyForm.setFormId(null); // 清空原有的 form_id，让数据库自动生成新的 newDiyForm.formId = null; // 清空原有的 form_id，让数据库自动生成新的
newDiyForm.setPageTitle(newDiyForm.getPageTitle() + "_副本"); newDiyForm.pageTitle = newDiyForm.pageTitle + "_副本";
newDiyForm.status = 0; newDiyForm.status = 0;
newDiyForm.setShare(""); newDiyForm.share = "";
newDiyForm.setWriteNum(0); newDiyForm.writeNum = 0;
const currentTime: number = Date.now() / 1000; const currentTime: number = Date.now() / 1000;
newDiyForm.createTime = currentTime; newDiyForm.createTime = currentTime;
newDiyForm.updateTime = currentTime; newDiyForm.updateTime = currentTime;
@@ -457,9 +457,9 @@ export class DiyFormServiceImplService {
for (const item of diyFormFields) { for (const item of diyFormFields) {
const newField: DiyFormFields = new DiyFormFields(); const newField: DiyFormFields = new DiyFormFields();
Object.assign(newField, item); Object.assign(newField, item);
newField.setFieldId(null); // 清空原有的 field_id，让数据库自动生成新的 newField.fieldId = null; // 清空原有的 field_id，让数据库自动生成新的
newField.setFormId(newFormId); newField.formId = newFormId;
newField.setWriteNum(0); newField.writeNum = 0;
newField.createTime = currentTime; newField.createTime = currentTime;
newField.updateTime = currentTime; newField.updateTime = currentTime;
newFormFieldList.push(newField); newFormFieldList.push(newField);
@@ -473,7 +473,7 @@ export class DiyFormServiceImplService {
if (!CommonUtils.isEmpty(diyFormWriteConfig)) { if (!CommonUtils.isEmpty(diyFormWriteConfig)) {
const newWriteConfig: DiyFormWriteConfigParam = new DiyFormWriteConfigParam(); const newWriteConfig: DiyFormWriteConfigParam = new DiyFormWriteConfigParam();
Object.assign(newWriteConfig, diyFormWriteConfig); Object.assign(newWriteConfig, diyFormWriteConfig);
newWriteConfig.setFormId(newFormId); newWriteConfig.formId = newFormId;
newWriteConfig.id = null; newWriteConfig.id = null;
this.coreDiyFormConfigService.addWriteConfig(newWriteConfig); this.coreDiyFormConfigService.addWriteConfig(newWriteConfig);
} }
@@ -482,7 +482,7 @@ export class DiyFormServiceImplService {
if (!CommonUtils.isEmpty(diyFormSubmitConfig)) { if (!CommonUtils.isEmpty(diyFormSubmitConfig)) {
const newSubmitConfig: DiyFormSubmitConfigParam = new DiyFormSubmitConfigParam(); const newSubmitConfig: DiyFormSubmitConfigParam = new DiyFormSubmitConfigParam();
Object.assign(newSubmitConfig, diyFormSubmitConfig); Object.assign(newSubmitConfig, diyFormSubmitConfig);
newSubmitConfig.setFormId(newFormId); newSubmitConfig.formId = newFormId;
newSubmitConfig.id = null; newSubmitConfig.id = null;
this.coreDiyFormConfigService.addSubmitConfig(newSubmitConfig); this.coreDiyFormConfigService.addSubmitConfig(newSubmitConfig);
} }
@@ -495,7 +495,7 @@ export class DiyFormServiceImplService {
*/ */
async getTemplate(params: DiyFormTemplateParam): Promise<any> { async getTemplate(params: DiyFormTemplateParam): Promise<any> {
const diyFormTemplateEnum: DiyFormTemplateEnum = new DiyFormTemplateEnum(); const diyFormTemplateEnum: DiyFormTemplateEnum = new DiyFormTemplateEnum();
return diyFormTemplateEnum.getTemplate(params.type, params.getTemplateKey()); return diyFormTemplateEnum.getTemplate(params.type, params.templateKey);
} }
/** /**
@@ -541,7 +541,7 @@ export class DiyFormServiceImplService {
formQueryWrapper.eq("form_id", formId); formQueryWrapper.eq("form_id", formId);
const diyForm: DiyForm = this.diyFormRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }); const diyForm: DiyForm = this.diyFormRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
if (diyForm != null) { if (diyForm != null) {
diyForm.setWriteNum(diyForm.getWriteNum() - 1); diyForm.writeNum = diyForm.writeNum - 1;
diyFormMapper.updateById(diyForm); diyFormMapper.updateById(diyForm);
} }
@@ -571,11 +571,11 @@ export class DiyFormServiceImplService {
any /* TODO: QueryWrapper<DiyFormFields> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<DiyFormFields> */ queryWrapper = new QueryWrapper();
queryWrapper.eq("site_id", this.requestContext.siteId) queryWrapper.eq("site_id", this.requestContext.siteId)
.eq("form_id", diyFormRecordsFieldsSearchParam.formId); .eq("form_id", diyFormRecordsFieldsSearchParam.formId);
if(diyFormRecordsFieldsSearchParam.getSort() === "asc") if(diyFormRecordsFieldsSearchParam.sort === "asc")
{ {
queryWrapper.orderByAsc(diyFormRecordsFieldsSearchParam.getOrder()); queryWrapper.orderByAsc(diyFormRecordsFieldsSearchParam.order);
}else { }else {
queryWrapper.orderByDesc(diyFormRecordsFieldsSearchParam.getOrder()); queryWrapper.orderByDesc(diyFormRecordsFieldsSearchParam.order);
} }
const list: DiyFormFields[] = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); const list: DiyFormFields[] = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
const listVo: DiyFormFieldsListVo[] = []; const listVo: DiyFormFieldsListVo[] = [];
@@ -595,10 +595,10 @@ export class DiyFormServiceImplService {
const limit: number = pageParam.limit; const limit: number = pageParam.limit;
// 验证表单ID集合 // 验证表单ID集合
const verifyFormIds: number[] = []; const verifyFormIds: number[] = [];
if (param.getVerifyFormIds() != null && !param.getVerifyFormIds().isEmpty()) { if (param.verifyFormIds != null && !param.verifyFormIds.isEmpty()) {
// 查询存在的表单ID // 查询存在的表单ID
const existForms: DiyForm[] = this.diyFormRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) const existForms: DiyForm[] = this.diyFormRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })
.in("form_id", param.getVerifyFormIds()) .in("form_id", param.verifyFormIds)
); );
verifyFormIds = existForms verifyFormIds = existForms
@@ -619,8 +619,8 @@ export class DiyFormServiceImplService {
if (StringUtils.hasText(param.type)) { if (StringUtils.hasText(param.type)) {
queryWrapper.eq(DiyForm::getType, param.type); queryWrapper.eq(DiyForm::getType, param.type);
} }
if (StringUtils.hasText(param.getAddon())) { if (StringUtils.hasText(param.addon)) {
queryWrapper.eq(DiyForm::getAddon, param.getAddon()); queryWrapper.eq(DiyForm::getAddon, param.addon);
} }
// 分页查询 // 分页查询
@@ -635,10 +635,10 @@ export class DiyFormServiceImplService {
Object.assign(diyFormInfoVo, item); Object.assign(diyFormInfoVo, item);
const currentType: Record<string, any> = new DiyFormTypeEnum().getType(item.type); const currentType: Record<string, any> = new DiyFormTypeEnum().getType(item.type);
const typeName: string = currentType.getStr("title"); const typeName: string = currentType.getStr("title");
diyFormInfoVo.setTypeName(typeName); diyFormInfoVo.typeName = typeName;
const addon: Addon = this.addonRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq(Addon::getKey, item.getAddon())); const addon: Addon = this.addonRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq(Addon::getKey, item.addon));
const addonName: string = CommonUtils.isNotEmpty(addon) ? addon.title : ""; const addonName: string = CommonUtils.isNotEmpty(addon) ? addon.title : "";
diyFormInfoVo.setAddonName(addonName); diyFormInfoVo.addonName = addonName;
resultList.push(diyFormInfoVo); resultList.push(diyFormInfoVo);
}); });
return PageResult.build(page, limit, formPageTotal, resultList); return PageResult.build(page, limit, formPageTotal, resultList);

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

@@ -23,22 +23,22 @@ export class GenerateServiceImplService {
const limit: number = pageParam.limit; const limit: number = pageParam.limit;
MPJany /* TODO: QueryWrapper<GenerateTable> */ queryWrapper = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<GenerateTable> */ queryWrapper = new MPJQueryWrapper();
queryWrapper.setAlias("ngt"); queryWrapper.alias = "ngt";
queryWrapper.select("ngt.id, ngt.table_name, ngt.table_content, ngt.module_name, ngt.class_name, ngt.create_time, ngt.edit_type, ngt.addon_name, ngt.order_type, ngt.parent_menu, ngt.relations, ngt.synchronous_number, na.title, na.`key`"); queryWrapper.select("ngt.id, ngt.table_name, ngt.table_content, ngt.module_name, ngt.class_name, ngt.create_time, ngt.edit_type, ngt.addon_name, ngt.order_type, ngt.parent_menu, ngt.relations, ngt.synchronous_number, na.title, na.`key`");
queryWrapper.leftJoin("?_addon na ON na.`key` = ngt.addon_name".replace("?_", this.appConfig.tablePrefix)); queryWrapper.leftJoin("?_addon na ON na.`key` = ngt.addon_name".replace("?_", this.appConfig.tablePrefix));
if (CommonUtils.isNotEmpty(searchParam.getTableName())) { if (CommonUtils.isNotEmpty(searchParam.tableName)) {
queryWrapper.like("ngt.table_name", searchParam.getTableName()); queryWrapper.like("ngt.table_name", searchParam.tableName);
} }
if (CommonUtils.isNotEmpty(searchParam.getTableContent())) { if (CommonUtils.isNotEmpty(searchParam.tableContent)) {
queryWrapper.eq("ngt.table_content", searchParam.getTableContent()); queryWrapper.eq("ngt.table_content", searchParam.tableContent);
} }
if (CommonUtils.isNotEmpty(searchParam.getAddonName())) { if (CommonUtils.isNotEmpty(searchParam.addonName)) {
if (searchParam.getAddonName() === "2") { if (searchParam.addonName === "2") {
queryWrapper.eq("ngt.addon_name", ""); queryWrapper.eq("ngt.addon_name", "");
} else { } else {
queryWrapper.like("ngt.addon_name", searchParam.getAddonName()); queryWrapper.like("ngt.addon_name", searchParam.addonName);
} }
} }
@@ -57,21 +57,21 @@ export class GenerateServiceImplService {
const vo: GenerateDetailVo = new GenerateDetailVo(); const vo: GenerateDetailVo = new GenerateDetailVo();
Object.assign(vo, generateTable); Object.assign(vo, generateTable);
if (vo.getOrderType() != 0) { if (vo.orderType != 0) {
const orderColumn: GenerateColumn = this.generateColumnRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("is_order", 1)); const orderColumn: GenerateColumn = this.generateColumnRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("is_order", 1));
if (CommonUtils.isNotEmpty(orderColumn)) { if (CommonUtils.isNotEmpty(orderColumn)) {
vo.setOrderColumnName(orderColumn.getColumnName()); vo.orderColumnName = orderColumn.columnName;
} else { } else {
vo.setOrderColumnName(""); vo.orderColumnName = "";
} }
} }
const deleteColumn: GenerateColumn = this.generateColumnRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("is_delete", 1)); const deleteColumn: GenerateColumn = this.generateColumnRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("is_delete", 1));
if (CommonUtils.isNotEmpty(deleteColumn)) { if (CommonUtils.isNotEmpty(deleteColumn)) {
vo.setDeleteColumnName(deleteColumn.getColumnName()); vo.deleteColumnName = deleteColumn.columnName;
vo.setIsDelete(1); vo.isDelete = 1;
} else { } else {
vo.setDeleteColumnName(""); vo.deleteColumnName = "";
vo.setIsDelete(0); vo.isDelete = 0;
} }
const columnList: GenerateColumn[] = this.generateColumnRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); const columnList: GenerateColumn[] = this.generateColumnRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }));
if (CommonUtils.isNotEmpty(columnList)) { if (CommonUtils.isNotEmpty(columnList)) {
@@ -79,65 +79,65 @@ export class GenerateServiceImplService {
for (const column of columnList) { for (const column of columnList) {
const generateColumnVo: GenerateColumnVo = new GenerateColumnVo(); const generateColumnVo: GenerateColumnVo = new GenerateColumnVo();
Object.assign(generateColumnVo, column); Object.assign(generateColumnVo, column);
if (column.getViewType() === "number") { if (column.viewType === "number") {
if (!column.getValidateType().isEmpty()) { if (!column.validateType.isEmpty()) {
if (column.getValidateType().startsWith("[")) { if (column.validateType.startsWith("[")) {
const numValidate: JSONArray = JSONUtil.parseArray(column.getValidateType()); const numValidate: JSONArray = JSONUtil.parseArray(column.validateType);
if (numValidate.get(0).toString() === "between") { if (numValidate.get(0).toString() === "between") {
generateColumnVo.setViewMax(JSONUtil.parseArray(numValidate.get(1)).get(1).toString()); generateColumnVo.viewMax = JSONUtil.parseArray(numValidate.get(1).get(1).toString());
generateColumnVo.setViewMin(JSONUtil.parseArray(numValidate.get(1)).get(0).toString()); generateColumnVo.viewMin = JSONUtil.parseArray(numValidate.get(1).get(0).toString());
} else if (numValidate.get(0).toString() === "max") { } else if (numValidate.get(0).toString() === "max") {
generateColumnVo.setViewMax(JSONUtil.parseArray(numValidate.get(1)).get(0).toString()); generateColumnVo.viewMax = JSONUtil.parseArray(numValidate.get(1).get(0).toString());
} else if (numValidate.get(0).toString() === "min") { } else if (numValidate.get(0).toString() === "min") {
generateColumnVo.setViewMin(JSONUtil.parseArray(numValidate.get(1)).get(0).toString()); generateColumnVo.viewMin = JSONUtil.parseArray(numValidate.get(1).get(0).toString());
} else { } else {
generateColumnVo.setViewMax("100"); generateColumnVo.viewMax = "100";
generateColumnVo.setViewMin("0"); generateColumnVo.viewMin = "0";
} }
} else { } else {
generateColumnVo.setViewMax("100"); generateColumnVo.viewMax = "100";
generateColumnVo.setViewMin("0"); generateColumnVo.viewMin = "0";
} }
} else { } else {
generateColumnVo.setViewMax("100"); generateColumnVo.viewMax = "100";
generateColumnVo.setViewMin("0"); generateColumnVo.viewMin = "0";
} }
} else { } else {
generateColumnVo.setViewMax(""); generateColumnVo.viewMax = "";
generateColumnVo.setViewMin(""); generateColumnVo.viewMin = "";
} }
if (!column.getValidateType().isEmpty()) { if (!column.validateType.isEmpty()) {
if (column.getValidateType().startsWith("[")) { if (column.validateType.startsWith("[")) {
const num1Validate: JSONArray = JSONUtil.parseArray(column.getValidateType()); const num1Validate: JSONArray = JSONUtil.parseArray(column.validateType);
if (num1Validate.get(0).toString() === "between") { if (num1Validate.get(0).toString() === "between") {
generateColumnVo.setMaxNumber(JSONUtil.parseArray(num1Validate.get(1)).get(1).toString()); generateColumnVo.maxNumber = JSONUtil.parseArray(num1Validate.get(1).get(1).toString());
generateColumnVo.setMinNumber(JSONUtil.parseArray(num1Validate.get(1)).get(0).toString()); generateColumnVo.minNumber = JSONUtil.parseArray(num1Validate.get(1).get(0).toString());
} else if (num1Validate.get(0).toString() === "max") { } else if (num1Validate.get(0).toString() === "max") {
generateColumnVo.setMaxNumber(JSONUtil.parseArray(num1Validate.get(1)).get(0).toString()); generateColumnVo.maxNumber = JSONUtil.parseArray(num1Validate.get(1).get(0).toString());
} else if (num1Validate.get(0).toString() === "min") { } else if (num1Validate.get(0).toString() === "min") {
generateColumnVo.setMinNumber(JSONUtil.parseArray(num1Validate.get(1)).get(0).toString()); generateColumnVo.minNumber = JSONUtil.parseArray(num1Validate.get(1).get(0).toString());
} else { } else {
generateColumnVo.setMaxNumber("120"); generateColumnVo.maxNumber = "120";
generateColumnVo.setMinNumber("1"); generateColumnVo.minNumber = "1";
} }
} else { } else {
generateColumnVo.setMaxNumber("120"); generateColumnVo.maxNumber = "120";
generateColumnVo.setMinNumber("1"); generateColumnVo.minNumber = "1";
} }
} else { } else {
generateColumnVo.setMaxNumber("120"); generateColumnVo.maxNumber = "120";
generateColumnVo.setMinNumber("1"); generateColumnVo.minNumber = "1";
} }
if (!column.getModel().isEmpty()) { if (!column.model.isEmpty()) {
generateColumnVo.setSelectType(2); generateColumnVo.selectType = 2;
} else { } else {
generateColumnVo.setSelectType(1); generateColumnVo.selectType = 1;
} }
columnVoList.push(generateColumnVo); columnVoList.push(generateColumnVo);
} }
vo.setTableColumn(columnVoList); vo.tableColumn = columnVoList;
} }
return vo; return vo;
} }
@@ -148,8 +148,8 @@ export class GenerateServiceImplService {
async add(generateParam: GenerateParam): Promise<any> { async add(generateParam: GenerateParam): Promise<any> {
const sql: string = "SHOW TABLE STATUS WHERE 1=1 "; const sql: string = "SHOW TABLE STATUS WHERE 1=1 ";
const tablePrefix: string = this.appConfig.tablePrefix; const tablePrefix: string = this.appConfig.tablePrefix;
if (!generateParam.getTableName().isEmpty()) { if (!generateParam.tableName.isEmpty()) {
sql += " AND Name = '" + generateParam.getTableName() + "'"; sql += " AND Name = '" + generateParam.tableName + "'";
} }
List<Record<String, Object>> listData = jdbcTemplate.queryForList(sql); List<Record<String, Object>> listData = jdbcTemplate.queryForList(sql);
if (CommonUtils.isEmpty(listData)) throw new AdminException("数据表不存在"); if (CommonUtils.isEmpty(listData)) throw new AdminException("数据表不存在");
@@ -159,11 +159,11 @@ export class GenerateServiceImplService {
//添加生成表数据 //添加生成表数据
const generateTable: GenerateTable = new GenerateTable(); const generateTable: GenerateTable = new GenerateTable();
generateTable.setTableName(tableName); generateTable.tableName = tableName;
generateTable.setTableContent(table.get("Comment").toString()); generateTable.tableContent = table.get("Comment".toString());
generateTable.setClassName(tableName); generateTable.className = tableName;
generateTable.createTime = Date.now( / 1000); generateTable.createTime = Date.now( / 1000);
generateTable.setModuleName(tableName); generateTable.moduleName = tableName;
this.generateTableRepository.save(generateTable); this.generateTableRepository.save(generateTable);
//添加生成字段数据 //添加生成字段数据
@@ -173,31 +173,31 @@ export class GenerateServiceImplService {
for (Record<String, Object> column : columns) { for (Record<String, Object> column : columns) {
const generateColumn: GenerateColumn = new GenerateColumn(); const generateColumn: GenerateColumn = new GenerateColumn();
generateColumn.setIsRequired(0); generateColumn.isRequired = 0;
const defaultColumn: string[] = {"id", "create_time", "update_time"}; const defaultColumn: string[] = {"id", "create_time", "update_time"};
if (column.get("IS_NULLABLE").toString() === "NO" && !column.get("COLUMN_KEY").equals("PRI") && [defaultColumn].includes(column.get("COLUMN_NAME").toString())) { if (column.get("IS_NULLABLE").toString() === "NO" && !column.get("COLUMN_KEY").equals("PRI") && [defaultColumn].includes(column.get("COLUMN_NAME").toString())) {
generateColumn.setIsRequired(1); generateColumn.isRequired = 1;
} }
generateColumn.setTableId(id); generateColumn.tableId = id;
generateColumn.setColumnName(column.get("COLUMN_NAME").toString()); generateColumn.columnName = column.get("COLUMN_NAME".toString());
generateColumn.setColumnType(getDbFieldType(column.get("DATA_TYPE").toString())); generateColumn.columnType = getDbFieldType(column.get("DATA_TYPE".toString()));
if (generateColumn.getColumnType() === "number" && generateColumn.getColumnName().includes("time")) { if (generateColumn.columnType === "number" && generateColumn.columnName.includes("time")) {
generateColumn.setColumnType("number"); generateColumn.columnType = "number";
} }
generateColumn.setColumnComment(column.get("COLUMN_COMMENT").toString()); generateColumn.columnComment = column.get("COLUMN_COMMENT".toString());
generateColumn.setIsPk(column.get("COLUMN_KEY").equals("PRI") ? 1 : 0); generateColumn.isPk = column.get("COLUMN_KEY".equals("PRI") ? 1 : 0);
generateColumn.setIsInsert([defaultColumn].includes(column.get("COLUMN_NAME").toString()) ? 0 : 1); generateColumn.isInsert = [defaultColumn].includes(column.get("COLUMN_NAME".toString()) ? 0 : 1);
generateColumn.setIsUpdate([defaultColumn].includes(column.get("COLUMN_NAME").toString()) ? 0 : 1); generateColumn.isUpdate = [defaultColumn].includes(column.get("COLUMN_NAME".toString()) ? 0 : 1);
generateColumn.setIsLists([defaultColumn].includes(column.get("COLUMN_NAME").toString()) ? 0 : 1); generateColumn.isLists = [defaultColumn].includes(column.get("COLUMN_NAME".toString()) ? 0 : 1);
generateColumn.setIsDelete(0); generateColumn.isDelete = 0;
generateColumn.setQueryType("="); generateColumn.queryType = "=";
generateColumn.setViewType("input"); generateColumn.viewType = "input";
generateColumn.setDictType(""); generateColumn.dictType = "";
generateColumn.setAddon(""); generateColumn.addon = "";
generateColumn.setModel(""); generateColumn.model = "";
generateColumn.setLabelKey(""); generateColumn.labelKey = "";
generateColumn.setValueKey(""); generateColumn.valueKey = "";
generateColumn.createTime = Date.now( / 1000); generateColumn.createTime = Date.now( / 1000);
generateColumn.updateTime = Date.now( / 1000); generateColumn.updateTime = Date.now( / 1000);
list.push(generateColumn); list.push(generateColumn);
@@ -214,56 +214,56 @@ export class GenerateServiceImplService {
//添加生成表数据 //添加生成表数据
const generateTable: GenerateTable = new GenerateTable(); const generateTable: GenerateTable = new GenerateTable();
generateTable.id = id; generateTable.id = id;
generateTable.setTableName(generateParam.getTableName()); generateTable.tableName = generateParam.tableName;
generateTable.setTableContent(generateParam.getTableContent()); generateTable.tableContent = generateParam.tableContent;
generateTable.setModuleName(generateParam.getModuleName()); generateTable.moduleName = generateParam.moduleName;
generateTable.setClassName(generateParam.getClassName()); generateTable.className = generateParam.className;
generateTable.setEditType(generateParam.getEditType()); generateTable.editType = generateParam.editType;
generateTable.setAddonName(generateParam.getAddonName()); generateTable.addonName = generateParam.addonName;
generateTable.setOrderType(generateParam.getOrderType()); generateTable.orderType = generateParam.orderType;
generateTable.setParentMenu(generateParam.getParentMenu()); generateTable.parentMenu = generateParam.parentMenu;
generateTable.setRelations(generateParam.getRelations()); generateTable.relations = generateParam.relations;
generateTableMapper.updateById(generateTable); generateTableMapper.updateById(generateTable);
//更新表字段 //更新表字段
this.generateColumnRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ })); this.generateColumnRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ }));
const columns: JSONArray = JSONUtil.parseArray(generateParam.getTableColumn()); const columns: JSONArray = JSONUtil.parseArray(generateParam.tableColumn);
const list: GenerateColumn[] = []; const list: GenerateColumn[] = [];
for (const i of number = 0; i < columns.length; i++) { for (const i of number = 0; i < columns.length; i++) {
const generateColumn: GenerateColumn = new GenerateColumn(); const generateColumn: GenerateColumn = new GenerateColumn();
const column: Record<string, any> = columns.getRecord<string, any>(i); const column: Record<string, any> = columns.getRecord<string, any>(i);
generateColumn.setTableId(id); generateColumn.tableId = id;
generateColumn.setColumnName(column.getStr("column_name")); generateColumn.columnName = column.getStr("column_name");
generateColumn.setColumnComment(column.getStr("column_comment")); generateColumn.columnComment = column.getStr("column_comment");
generateColumn.setIsPk(column.getInt("is_pk")); generateColumn.isPk = column.getInt("is_pk");
generateColumn.setIsRequired(column.getInt("is_required")); generateColumn.isRequired = column.getInt("is_required");
generateColumn.setIsInsert(column.getInt("is_insert")); generateColumn.isInsert = column.getInt("is_insert");
generateColumn.setIsUpdate(column.getInt("is_update")); generateColumn.isUpdate = column.getInt("is_update");
generateColumn.setIsLists(column.getInt("is_lists")); generateColumn.isLists = column.getInt("is_lists");
generateColumn.setIsSearch(column.getInt("is_search")); generateColumn.isSearch = column.getInt("is_search");
generateColumn.setIsDelete(0); generateColumn.isDelete = 0;
generateColumn.setIsOrder(0); generateColumn.isOrder = 0;
generateColumn.setQueryType(column.getStr("query_type")); generateColumn.queryType = column.getStr("query_type");
generateColumn.setViewType(CommonUtils.isEmpty(column.getStr("view_type")) ? "input" : column.getStr("view_type")); generateColumn.viewType = CommonUtils.isEmpty(column.getStr("view_type") ? "input" : column.getStr("view_type"));
generateColumn.setDictType(CommonUtils.isEmpty(column.getStr("dict_type")) ? "" : column.getStr("dict_type")); generateColumn.dictType = CommonUtils.isEmpty(column.getStr("dict_type") ? "" : column.getStr("dict_type"));
generateColumn.setAddon(CommonUtils.isEmpty(column.getStr("addon")) ? "" : column.getStr("addon")); generateColumn.addon = CommonUtils.isEmpty(column.getStr("addon") ? "" : column.getStr("addon"));
generateColumn.setModel(CommonUtils.isEmpty(column.getStr("model")) ? "" : column.getStr("model")); generateColumn.model = CommonUtils.isEmpty(column.getStr("model") ? "" : column.getStr("model"));
generateColumn.setLabelKey(CommonUtils.isEmpty(column.getStr("label_key")) ? "" : column.getStr("label_key")); generateColumn.labelKey = CommonUtils.isEmpty(column.getStr("label_key") ? "" : column.getStr("label_key"));
generateColumn.setValueKey(CommonUtils.isEmpty(column.getStr("value_key")) ? "" : column.getStr("value_key")); generateColumn.valueKey = CommonUtils.isEmpty(column.getStr("value_key") ? "" : column.getStr("value_key"));
generateColumn.updateTime = Date.now( / 1000); generateColumn.updateTime = Date.now( / 1000);
generateColumn.createTime = Date.now( / 1000); generateColumn.createTime = Date.now( / 1000);
generateColumn.setColumnType(CommonUtils.isEmpty(column.getStr("column_type")) ? "String" : column.getStr("column_type")); generateColumn.columnType = CommonUtils.isEmpty(column.getStr("column_type") ? "String" : column.getStr("column_type"));
generateColumn.setValidateType(CommonUtils.isEmpty(column.getStr("validate_type")) ? "" : column.getStr("validate_type")); generateColumn.validateType = CommonUtils.isEmpty(column.getStr("validate_type") ? "" : column.getStr("validate_type"));
//传入字段rule暂时不知含义，待定 //传入字段rule暂时不知含义，待定
if (generateParam.getIsDelete() == 1) { if (generateParam.isDelete == 1) {
if (column.getStr("column_name").equals(generateParam.getDeleteColumnName())) { if (column.getStr("column_name").equals(generateParam.deleteColumnName)) {
generateColumn.setIsDelete(1); generateColumn.isDelete = 1;
} }
} }
if (generateParam.getOrderType() != 0) { if (generateParam.orderType != 0) {
if (column.getStr("column_name").equals(generateParam.getOrderColumnName())) { if (column.getStr("column_name").equals(generateParam.orderColumnName)) {
generateColumn.setIsOrder(1); generateColumn.isOrder = 1;
} }
} }
@@ -272,17 +272,17 @@ export class GenerateServiceImplService {
const jsonArray: JSONArray = new JSONArray(); const jsonArray: JSONArray = new JSONArray();
jsonArray.push("between"); jsonArray.push("between");
jsonArray.push(new String[]{column.getStr("min_number"), column.getStr("max_number")}); jsonArray.push(new String[]{column.getStr("min_number"), column.getStr("max_number")});
generateColumn.setValidateType(jsonArray.toString()); generateColumn.validateType = jsonArray.toString();
} else if (column.getStr("validate_type").equals("max")) { } else if (column.getStr("validate_type").equals("max")) {
const jsonArray: JSONArray = new JSONArray(); const jsonArray: JSONArray = new JSONArray();
jsonArray.push("max"); jsonArray.push("max");
jsonArray.push(new String[]{column.getStr("max_number")}); jsonArray.push(new String[]{column.getStr("max_number")});
generateColumn.setValidateType(jsonArray.toString()); generateColumn.validateType = jsonArray.toString();
} else if (column.getStr("validate_type").equals("min")) { } else if (column.getStr("validate_type").equals("min")) {
const jsonArray: JSONArray = new JSONArray(); const jsonArray: JSONArray = new JSONArray();
jsonArray.push("min"); jsonArray.push("min");
jsonArray.push(new String[]{column.getStr("min_number")}); jsonArray.push(new String[]{column.getStr("min_number")});
generateColumn.setValidateType(jsonArray.toString()); generateColumn.validateType = jsonArray.toString();
} }
} }
@@ -290,10 +290,10 @@ export class GenerateServiceImplService {
const numJsonArray: JSONArray = new JSONArray(); const numJsonArray: JSONArray = new JSONArray();
numJsonArray.push("between"); numJsonArray.push("between");
numJsonArray.push(new String[]{column.getStr("view_min"), column.getStr("view_max")}); numJsonArray.push(new String[]{column.getStr("view_min"), column.getStr("view_max")});
generateColumn.setValidateType(numJsonArray.toString()); generateColumn.validateType = numJsonArray.toString();
} }
if (CommonUtils.isNotEmpty(column.getStr("model"))) { if (CommonUtils.isNotEmpty(column.getStr("model"))) {
generateColumn.setDictType(""); generateColumn.dictType = "";
} }
list.push(generateColumn); list.push(generateColumn);
@@ -320,14 +320,14 @@ export class GenerateServiceImplService {
const list: CoreGenerateTemplateVo[] = this.coreGenerateService.generateCode(generateTable, columnList); const list: CoreGenerateTemplateVo[] = this.coreGenerateService.generateCode(generateTable, columnList);
// 下载 // 下载
if (generateCodeParam.getGenerateType() === "2") { if (generateCodeParam.generateType === "2") {
const tempDir: string = this.appConfig.webRootDownResource + "upload/generate/"; const tempDir: string = this.appConfig.webRootDownResource + "upload/generate/";
const packageDir: string = tempDir + "package/"; const packageDir: string = tempDir + "package/";
FileTools.createDirs(packageDir); FileTools.createDirs(packageDir);
FileUtil.clean(tempDir); FileUtil.clean(tempDir);
for (const coreGenerateTemplateVo of list) { for (const coreGenerateTemplateVo of list) {
FileTools.createDirs(packageDir + coreGenerateTemplateVo.path); FileTools.createDirs(packageDir + coreGenerateTemplateVo.path);
FileUtil.writeUtf8String(coreGenerateTemplateVo.data, packageDir + coreGenerateTemplateVo.getPath(, coreGenerateTemplateVo.getFileName())); FileUtil.writeUtf8String(coreGenerateTemplateVo.data, packageDir + coreGenerateTemplateVo.getPath(, coreGenerateTemplateVo.fileName));
} }
const zipFile: string = ZipUtil.zip(packageDir, tempDir + "package.zip"); const zipFile: string = ZipUtil.zip(packageDir, tempDir + "package.zip");
} else { } else {
@@ -338,7 +338,7 @@ export class GenerateServiceImplService {
if (coreGenerateTemplateVo.type === "sql") { if (coreGenerateTemplateVo.type === "sql") {
SQLScriptRunnerTools.execScript(coreGenerateTemplateVo.data); SQLScriptRunnerTools.execScript(coreGenerateTemplateVo.data);
} else { } else {
FileUtil.writeUtf8String(coreGenerateTemplateVo.data, this.appConfig.projectRoot + "/" + coreGenerateTemplateVo.getPath(, coreGenerateTemplateVo.getFileName())); FileUtil.writeUtf8String(coreGenerateTemplateVo.data, this.appConfig.projectRoot + "/" + coreGenerateTemplateVo.getPath(, coreGenerateTemplateVo.fileName));
} }
} }
} }
@@ -355,10 +355,10 @@ export class GenerateServiceImplService {
const voList: GeneratePreviewVo[] = []; const voList: GeneratePreviewVo[] = [];
for (const coreGenerateTemplateVo of columnList) { for (const coreGenerateTemplateVo of columnList) {
const vo: GeneratePreviewVo = new GeneratePreviewVo(); const vo: GeneratePreviewVo = new GeneratePreviewVo();
vo.name = coreGenerateTemplateVo.getFileName(); vo.name = coreGenerateTemplateVo.fileName;
vo.type = coreGenerateTemplateVo.type; vo.type = coreGenerateTemplateVo.type;
vo.setContent(coreGenerateTemplateVo.data); vo.content = coreGenerateTemplateVo.data;
vo.setFileDir(coreGenerateTemplateVo.path + "/"); vo.fileDir = coreGenerateTemplateVo.path + "/";
voList.push(vo); voList.push(vo);
} }
return voList; return voList;
@@ -369,7 +369,7 @@ export class GenerateServiceImplService {
*/ */
async getDbFieldType(type: string): Promise<any> { async getDbFieldType(type: string): Promise<any> {
type = getDbType(type); type = getDbType(type);
const map: Record<String, String[]> = SqlColumnEnum.getMap(); const map: Record<String, String[]> = SqlColumnEnum.map;
const field: string = ""; const field: string = "";
for (Map.Entry<String, String[]> entry : map.entrySet()) { for (Map.Entry<String, String[]> entry : map.entrySet()) {
if ([entry.getValue(]).includes(type)) { if ([entry.getValue(]).includes(type)) {

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

@@ -24,24 +24,24 @@ export class AuthSiteServiceImplService {
any /* TODO: QueryWrapper<Site> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<Site> */ queryWrapper = new QueryWrapper();
//查询条件判断组装 //查询条件判断组装
if (CommonUtils.isNotEmpty(searchParam.getKeywords())) { if (CommonUtils.isNotEmpty(searchParam.keywords)) {
queryWrapper.like("site_name", searchParam.getKeywords()).or().like("site_id", searchParam.getKeywords()); queryWrapper.like("site_name", searchParam.keywords).or().like("site_id", searchParam.keywords);
} }
if (CommonUtils.isNotEmpty(searchParam.status)) { if (CommonUtils.isNotEmpty(searchParam.status)) {
queryWrapper.eq("status", searchParam.status); queryWrapper.eq("status", searchParam.status);
} }
if (CommonUtils.isNotEmpty(searchParam.getGroupId())) { if (CommonUtils.isNotEmpty(searchParam.groupId)) {
queryWrapper.eq("group_id", searchParam.getGroupId()); queryWrapper.eq("group_id", searchParam.groupId);
} }
if (CommonUtils.isNotEmpty(searchParam.getApp())) { if (CommonUtils.isNotEmpty(searchParam.app)) {
queryWrapper.like("app", searchParam.getApp()); queryWrapper.like("app", searchParam.app);
} }
if (CommonUtils.isNotEmpty(searchParam.getSiteDomain())) { if (CommonUtils.isNotEmpty(searchParam.siteDomain)) {
queryWrapper.like("site_domain", searchParam.getSiteDomain()); queryWrapper.like("site_domain", searchParam.siteDomain);
} }
queryWrapper.ne("app_type", "admin"); queryWrapper.ne("app_type", "admin");
@@ -72,9 +72,9 @@ export class AuthSiteServiceImplService {
} }
} }
if (CommonUtils.isNotEmpty(searchParam.getExpireTime())) { if (CommonUtils.isNotEmpty(searchParam.expireTime)) {
const expireTime: string[] = searchParam.getExpireTime(); const expireTime: string[] = searchParam.expireTime;
const startTime: number = (expireTime[0] == null) ? 0: DateUtils.StringToTimestamp(expireTime[0]); const startTime: number = (expireTime[0] == null) ? 0: DateUtils.StringToTimestamp(expireTime[0]);
console.log(startTime); console.log(startTime);
const endTime: number = (expireTime[1] == null) ? 0: DateUtils.StringToTimestamp(expireTime[1]); const endTime: number = (expireTime[1] == null) ? 0: DateUtils.StringToTimestamp(expireTime[1]);
@@ -90,10 +90,10 @@ export class AuthSiteServiceImplService {
} }
} }
if(CommonUtils.isEmpty(searchParam.getSort())){ if(CommonUtils.isEmpty(searchParam.sort)){
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time");
}else{ }else{
queryWrapper.orderByDesc(searchParam.getSort()); queryWrapper.orderByDesc(searchParam.sort);
} }
[Site[], number] iPage = this.siteRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); [Site[], number] iPage = this.siteRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
@@ -116,13 +116,13 @@ export class AuthSiteServiceImplService {
.leftJoin("?_site_group nsg ON ns.group_id = nsg.group_id".replace("?_", this.appConfig.tablePrefix)); .leftJoin("?_site_group nsg ON ns.group_id = nsg.group_id".replace("?_", this.appConfig.tablePrefix));
siteMPJQueryWrapper.eq("ns.site_id", id); siteMPJQueryWrapper.eq("ns.site_id", id);
const siteInfoVo: SiteInfoVo = siteMapper.selectJoinOne(SiteInfoVo.class, siteMPJQueryWrapper); const siteInfoVo: SiteInfoVo = siteMapper.selectJoinOne(SiteInfoVo.class, siteMPJQueryWrapper);
siteInfoVo.setAddonKeys(this.this.CoreSiteService.getAddonKeysBySiteId(siteInfoVo.siteId)); siteInfoVo.addonKeys = this.this.CoreSiteService.getAddonKeysBySiteId(siteInfoVo.siteId);
if(siteInfoVo.getAddonKeys().size()!=0){ if(siteInfoVo.addonKeys.size()!=0){
siteInfoVo.setSiteAddons(this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("type", AddonActionEnum.ADDON.getCode()))); siteInfoVo.siteAddons = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("type", AddonActionEnum.ADDON.code)));
siteInfoVo.setApps(this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("type", AddonActionEnum.APP.getCode()))); siteInfoVo.apps = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("type", AddonActionEnum.APP.code)));
}else{ }else{
siteInfoVo.setSiteAddons([]); siteInfoVo.siteAddons = [];
siteInfoVo.setApps([]); siteInfoVo.apps = [];
} }
return siteInfoVo; return siteInfoVo;
} }
@@ -132,33 +132,33 @@ export class AuthSiteServiceImplService {
*/ */
async add(addParam: SiteParam): Promise<any> { async add(addParam: SiteParam): Promise<any> {
const model: Site = new Site(); const model: Site = new Site();
model.setSiteName(addParam.getSiteName()); model.siteName = addParam.siteName;
model.setGroupId(addParam.getGroupId()); model.groupId = addParam.groupId;
model.setKeywords(addParam.getKeywords()); model.keywords = addParam.keywords;
model.setAppType(addParam.appType); model.appType = addParam.appType;
//model.setLogo(UrlUtils.toRelativeUrl(addParam.getLogo())); //model.logo = UrlUtils.toRelativeUrl(addParam.logo);
model.desc = addParam.desc; model.desc = addParam.desc;
model.status = addParam.status; model.status = addParam.status;
model.setLatitude(addParam.getLatitude()); model.latitude = addParam.latitude;
model.setLongitude(addParam.getLongitude()); model.longitude = addParam.longitude;
model.setProvinceId(addParam.getProvinceId()); model.provinceId = addParam.provinceId;
model.setCityId(addParam.getCityId()); model.cityId = addParam.cityId;
model.setDistrictId(addParam.getDistrictId()); model.districtId = addParam.districtId;
model.setAddress(addParam.getAddress()); model.address = addParam.address;
model.setFullAddress(addParam.getFullAddress()); model.fullAddress = addParam.fullAddress;
model.setPhone(addParam.getPhone()); model.phone = addParam.phone;
model.setBusinessHours(addParam.getBusinessHours()); model.businessHours = addParam.businessHours;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
model.setExpireTime(addParam.getExpireTime()); model.expireTime = addParam.expireTime;
model.setFrontEndName(addParam.getFrontEndName()); model.frontEndName = addParam.frontEndName;
model.setFrontEndLogo(addParam.getFrontEndLogo()); model.frontEndLogo = addParam.frontEndLogo;
model.setFrontEndIcon(addParam.getFrontEndIcon()); model.frontEndIcon = addParam.frontEndIcon;
model.icon = addParam.icon; model.icon = addParam.icon;
model.setMemberNo(addParam.getMemberNo()); model.memberNo = addParam.memberNo;
model.setApp(addParam.getApp()); model.app = addParam.app;
model.setAddons(addParam.getAddons()); model.addons = addParam.addons;
model.setInitalledAddon(addParam.getInitalledAddon()); model.initalledAddon = addParam.initalledAddon;
model.setSiteDomain(addParam.getSiteDomain()); model.siteDomain = addParam.siteDomain;
this.siteRepository.save(model); this.siteRepository.save(model);
} }
@@ -171,32 +171,32 @@ export class AuthSiteServiceImplService {
if (!model) throw new BadRequestException("数据不存在!"); if (!model) throw new BadRequestException("数据不存在!");
model.siteId = id; model.siteId = id;
model.setSiteName(editParam.getSiteName()); model.siteName = editParam.siteName;
model.setGroupId(editParam.getGroupId()); model.groupId = editParam.groupId;
model.setKeywords(editParam.getKeywords()); model.keywords = editParam.keywords;
model.setAppType(editParam.appType); model.appType = editParam.appType;
//model.setLogo(UrlUtils.toRelativeUrl(editParam.getLogo())); //model.logo = UrlUtils.toRelativeUrl(editParam.logo);
model.desc = editParam.desc; model.desc = editParam.desc;
model.status = editParam.status; model.status = editParam.status;
model.setLatitude(editParam.getLatitude()); model.latitude = editParam.latitude;
model.setLongitude(editParam.getLongitude()); model.longitude = editParam.longitude;
model.setProvinceId(editParam.getProvinceId()); model.provinceId = editParam.provinceId;
model.setCityId(editParam.getCityId()); model.cityId = editParam.cityId;
model.setDistrictId(editParam.getDistrictId()); model.districtId = editParam.districtId;
model.setAddress(editParam.getAddress()); model.address = editParam.address;
model.setFullAddress(editParam.getFullAddress()); model.fullAddress = editParam.fullAddress;
model.setPhone(editParam.getPhone()); model.phone = editParam.phone;
model.setBusinessHours(editParam.getBusinessHours()); model.businessHours = editParam.businessHours;
model.setExpireTime(editParam.getExpireTime()); model.expireTime = editParam.expireTime;
model.setFrontEndName(editParam.getFrontEndName()); model.frontEndName = editParam.frontEndName;
model.setFrontEndLogo(editParam.getFrontEndLogo()); model.frontEndLogo = editParam.frontEndLogo;
model.setFrontEndIcon(editParam.getFrontEndIcon()); model.frontEndIcon = editParam.frontEndIcon;
model.icon = editParam.icon; model.icon = editParam.icon;
model.setMemberNo(editParam.getMemberNo()); model.memberNo = editParam.memberNo;
model.setApp(editParam.getApp()); model.app = editParam.app;
model.setAddons(editParam.getAddons()); model.addons = editParam.addons;
model.setInitalledAddon(editParam.getInitalledAddon()); model.initalledAddon = editParam.initalledAddon;
model.setSiteDomain(editParam.getSiteDomain()); model.siteDomain = editParam.siteDomain;
siteMapper.updateById(model); siteMapper.updateById(model);
} }
@@ -218,7 +218,7 @@ export class AuthSiteServiceImplService {
async closeSite(siteId: number): Promise<any> { async closeSite(siteId: number): Promise<any> {
const model: Site = new Site(); const model: Site = new Site();
model.siteId = siteId; model.siteId = siteId;
model.status = SiteStatusEnum.CLOSE.getCode(); model.status = SiteStatusEnum.CLOSE.code;
siteMapper.updateById(model); siteMapper.updateById(model);
} }
@@ -228,7 +228,7 @@ export class AuthSiteServiceImplService {
async openSite(siteId: number): Promise<any> { async openSite(siteId: number): Promise<any> {
const model: Site = new Site(); const model: Site = new Site();
model.siteId = siteId; model.siteId = siteId;
model.status = SiteStatusEnum.ON.getCode(); model.status = SiteStatusEnum.ON.code;
siteMapper.updateById(model); siteMapper.updateById(model);
} }
@@ -258,13 +258,13 @@ export class AuthSiteServiceImplService {
queryWrapper.eq("status", siteSearchParam.status); queryWrapper.eq("status", siteSearchParam.status);
} }
if (CommonUtils.isNotEmpty(siteSearchParam.getGroupId())) { if (CommonUtils.isNotEmpty(siteSearchParam.groupId)) {
queryWrapper.eq("group_id", siteSearchParam.getGroupId()); queryWrapper.eq("group_id", siteSearchParam.groupId);
} }
if (CommonUtils.isNotEmpty(siteSearchParam.getExpireTime())) { if (CommonUtils.isNotEmpty(siteSearchParam.expireTime)) {
const expireTime: string[] = siteSearchParam.getExpireTime(); const expireTime: string[] = siteSearchParam.expireTime;
const startTime: number = (expireTime[0] == null) ? 0: DateUtils.StringToTimestamp(expireTime[0]); const startTime: number = (expireTime[0] == null) ? 0: DateUtils.StringToTimestamp(expireTime[0]);
const endTime: number = (expireTime[1] == null) ? 0: DateUtils.StringToTimestamp(expireTime[1]); const endTime: number = (expireTime[1] == null) ? 0: DateUtils.StringToTimestamp(expireTime[1]);
if(startTime > 0 && endTime > 0) if(startTime > 0 && endTime > 0)
@@ -305,12 +305,12 @@ export class AuthSiteServiceImplService {
const siteGroupList: SiteGroup[] = this.siteGroupRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); const siteGroupList: SiteGroup[] = this.siteGroupRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
for (const siteGroup of siteGroupList) { for (const siteGroup of siteGroupList) {
const userCreateSiteVo: UserCreateSiteVo = new UserCreateSiteVo(); const userCreateSiteVo: UserCreateSiteVo = new UserCreateSiteVo();
userCreateSiteVo.setGroupId(siteGroup.getGroupId()); userCreateSiteVo.groupId = siteGroup.groupId;
const siteGroupVo: SiteGroupVo = new SiteGroupVo(); const siteGroupVo: SiteGroupVo = new SiteGroupVo();
BeanUtil.copyProperties(siteGroup, siteGroupVo); BeanUtil.copyProperties(siteGroup, siteGroupVo);
siteGroupVo.setAppName(this.addonService.getTitleListByKey(siteGroup.getApp())); siteGroupVo.appName = this.addonService.getTitleListByKey(siteGroup.app);
siteGroupVo.setAddonName(this.addonService.getTitleListByKey(siteGroup.getAddon())); siteGroupVo.addonName = this.addonService.getTitleListByKey(siteGroup.addon);
userCreateSiteVo.setSiteGroup(siteGroupVo); userCreateSiteVo.siteGroup = siteGroupVo;
userCreateSiteVoList.push(userCreateSiteVo); userCreateSiteVoList.push(userCreateSiteVo);
} }
}else{ }else{
@@ -320,12 +320,12 @@ export class AuthSiteServiceImplService {
for (const userCreateSiteLimit of userCreateSiteLimitList) { for (const userCreateSiteLimit of userCreateSiteLimitList) {
const userCreateSiteVo: UserCreateSiteVo = new UserCreateSiteVo(); const userCreateSiteVo: UserCreateSiteVo = new UserCreateSiteVo();
BeanUtil.copyProperties(userCreateSiteLimit, userCreateSiteVo); BeanUtil.copyProperties(userCreateSiteLimit, userCreateSiteVo);
const siteGroup: SiteGroup = siteGroupMapper.selectById(userCreateSiteLimit.getGroupId()); const siteGroup: SiteGroup = siteGroupMapper.selectById(userCreateSiteLimit.groupId);
const siteGroupVo: SiteGroupVo = new SiteGroupVo(); const siteGroupVo: SiteGroupVo = new SiteGroupVo();
BeanUtil.copyProperties(siteGroup, siteGroupVo); BeanUtil.copyProperties(siteGroup, siteGroupVo);
siteGroupVo.setAppName(this.addonService.getTitleListByKey(siteGroup.getApp())); siteGroupVo.appName = this.addonService.getTitleListByKey(siteGroup.app);
siteGroupVo.setAddonName(this.addonService.getTitleListByKey(siteGroup.getAddon())); siteGroupVo.addonName = this.addonService.getTitleListByKey(siteGroup.addon);
userCreateSiteVo.setSiteGroup(siteGroupVo); userCreateSiteVo.siteGroup = siteGroupVo;
userCreateSiteVoList.push(userCreateSiteVo); userCreateSiteVoList.push(userCreateSiteVo);
} }
} }
@@ -338,19 +338,19 @@ export class AuthSiteServiceImplService {
async createSite(homeSiteAddParam: HomeSiteAddParam): Promise<any> { async createSite(homeSiteAddParam: HomeSiteAddParam): Promise<any> {
const month: number = 1; const month: number = 1;
if(!this.authService.isSuperAdmin()){ if(!this.authService.isSuperAdmin()){
const userCreateSiteLimit: UserCreateSiteLimit = this.userCreateSiteLimitRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("group_id", homeSiteAddParam.getGroupId())); const userCreateSiteLimit: UserCreateSiteLimit = this.userCreateSiteLimitRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("group_id", homeSiteAddParam.groupId));
if (!userCreateSiteLimit) throw new BadRequestException("NO_PERMISSION_TO_CREATE_SITE_GROUP"); if (!userCreateSiteLimit) throw new BadRequestException("NO_PERMISSION_TO_CREATE_SITE_GROUP");
const userSiteNum: number = this.siteGroupService.getUserSiteGroupSiteNum(RequestUtils.uid(), homeSiteAddParam.getGroupId()); const userSiteNum: number = this.siteGroupService.getUserSiteGroupSiteNum(RequestUtils.uid(), homeSiteAddParam.groupId);
if(userSiteNum>userCreateSiteLimit.getNum()-1){ if(userSiteNum>userCreateSiteLimit.num-1){
throw new BadRequestException("SITE_GROUP_CREATE_SITE_EXCEEDS_LIMIT"); throw new BadRequestException("SITE_GROUP_CREATE_SITE_EXCEEDS_LIMIT");
} }
month=userCreateSiteLimit.getMonth(); month=userCreateSiteLimit.month;
} }
const siteAddParam: SiteAddParam = new SiteAddParam(); const siteAddParam: SiteAddParam = new SiteAddParam();
siteAddParam.setSiteName(homeSiteAddParam.getSiteName()); siteAddParam.siteName = homeSiteAddParam.siteName;
siteAddParam.setUid(RequestUtils.uid()); siteAddParam.uid = RequestUtils.uid();
siteAddParam.setGroupId(homeSiteAddParam.getGroupId()); siteAddParam.groupId = homeSiteAddParam.groupId;
siteAddParam.setExpireTime(DateUtils.getDateAddMonth(month)); siteAddParam.expireTime = DateUtils.getDateAddMonth(month);
this.siteService.push(siteAddParam); this.siteService.push(siteAddParam);
} }
@@ -363,8 +363,8 @@ export class AuthSiteServiceImplService {
return List.of(); return List.of();
} }
const addonList: Addon[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) const addonList: Addon[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })
.eq(Addon::getStatus, AddonStatusEnum.ON.getCode()) .eq(Addon::getStatus, AddonStatusEnum.ON.code)
.eq(Addon::getType, AddonActionEnum.APP.getCode()) .eq(Addon::getType, AddonActionEnum.APP.code)
.in(Addon::getKey, siteGroupAppList)); .in(Addon::getKey, siteGroupAppList));
return processAddonList(addonList); return processAddonList(addonList);

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

@@ -24,18 +24,18 @@ export class MemberAccountServiceImplService {
const limit: number = pageParam.limit; const limit: number = pageParam.limit;
MPJany /* TODO: QueryWrapper<MemberAccountLog> */ queryWrapper = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<MemberAccountLog> */ queryWrapper = new MPJQueryWrapper();
queryWrapper.setAlias("mal").innerJoin("?_member m ON mal.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix)); queryWrapper.alias = "mal".innerJoin("?_member m ON mal.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
queryWrapper.select("mal.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg"); queryWrapper.select("mal.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg");
queryWrapper.eq("mal.site_id", siteId); queryWrapper.eq("mal.site_id", siteId);
queryWrapper.eq("mal.account_type", searchParam.getAccountType()); queryWrapper.eq("mal.account_type", searchParam.accountType);
queryWrapper.orderByDesc("mal.id"); queryWrapper.orderByDesc("mal.id");
if (CommonUtils.isNotEmpty(searchParam.getKeywords())) if (CommonUtils.isNotEmpty(searchParam.keywords))
queryWrapper.like("m.member_no|m.username|m.nickname|m.mobile", searchParam.getKeywords()); queryWrapper.like("m.member_no|m.username|m.nickname|m.mobile", searchParam.keywords);
if (ObjectUtil.defaultIfNull(searchParam.memberId, 0) > 0) if (ObjectUtil.defaultIfNull(searchParam.memberId, 0) > 0)
queryWrapper.eq("mal.member_id", searchParam.memberId); queryWrapper.eq("mal.member_id", searchParam.memberId);
if (CommonUtils.isNotEmpty(searchParam.getFromType())) if (CommonUtils.isNotEmpty(searchParam.fromType))
queryWrapper.eq("mal.from_type", searchParam.getFromType()); queryWrapper.eq("mal.from_type", searchParam.fromType);
if (CommonUtils.isNotEmpty(searchParam.createTime)) if (CommonUtils.isNotEmpty(searchParam.createTime))
QueryMapperUtils.buildByTime(queryWrapper, "mal.create_time", searchParam.createTime); QueryMapperUtils.buildByTime(queryWrapper, "mal.create_time", searchParam.createTime);
@@ -48,7 +48,7 @@ export class MemberAccountServiceImplService {
const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo(); const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo();
Object.assign(memberInfoVo, item); Object.assign(memberInfoVo, item);
vo.setMember(memberInfoVo); vo.member = memberInfoVo;
list.push(vo); list.push(vo);
} }
return PageResult.build(page, limit, iPageTotal).setData(list); return PageResult.build(page, limit, iPageTotal).setData(list);
@@ -80,27 +80,27 @@ export class MemberAccountServiceImplService {
if (CommonUtils.isNotEmpty(searchParam.memberId) && searchParam.memberId > 0) { if (CommonUtils.isNotEmpty(searchParam.memberId) && searchParam.memberId > 0) {
const memberAccountInfo: MemberAccountVo = this.getMemberAccountInfo(searchParam.memberId); const memberAccountInfo: MemberAccountVo = this.getMemberAccountInfo(searchParam.memberId);
vo.setCommission(memberAccountInfo.getCommission()); vo.commission = memberAccountInfo.commission;
vo.setCommissionCashOuting(memberAccountInfo.getCommissionCashOuting()); vo.commissionCashOuting = memberAccountInfo.commissionCashOuting;
vo.setTotalCommission(memberAccountInfo.getCommissionGet()); vo.totalCommission = memberAccountInfo.commissionGet;
const memberAccountLog: MemberAccountLog = this.memberAccountLogRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS account_sum") const memberAccountLog: MemberAccountLog = this.memberAccountLogRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS account_sum")
.eq("member_id", searchParam.memberId) .eq("member_id", searchParam.memberId)
.eq("site_id", siteId) .eq("site_id", siteId)
.eq("account_type", AccountTypeEnum.COMMISSION.type) .eq("account_type", AccountTypeEnum.COMMISSION.type)
.eq("from_type", "cash_out")); .eq("from_type", "cash_out"));
vo.setWithdrawnCommission(memberAccountLog == null ? zero : memberAccountLog.getAccountSum()); vo.withdrawnCommission = memberAccountLog == null ? zero : memberAccountLog.accountSum;
} else { } else {
const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS commission_get,SUM(commission) AS commission, SUM(commission_cash_outing) AS commission_cash_outing") const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS commission_get,SUM(commission) AS commission, SUM(commission_cash_outing) AS commission_cash_outing")
.eq("site_id", siteId)); .eq("site_id", siteId));
vo.setCommission(member == null ? zero : member.getCommission()); vo.commission = member == null ? zero : member.commission;
vo.setCommissionCashOuting(member == null ? zero : member.getCommissionCashOuting()); vo.commissionCashOuting = member == null ? zero : member.commissionCashOuting;
vo.setTotalCommission(member == null ? zero : member.getCommissionGet()); vo.totalCommission = member == null ? zero : member.commissionGet;
const memberAccountLog: MemberAccountLog = this.memberAccountLogRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS account_sum") const memberAccountLog: MemberAccountLog = this.memberAccountLogRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS account_sum")
.eq("site_id", siteId) .eq("site_id", siteId)
.eq("account_type", AccountTypeEnum.COMMISSION.type) .eq("account_type", AccountTypeEnum.COMMISSION.type)
.eq("from_type", "cash_out")); .eq("from_type", "cash_out"));
vo.setWithdrawnCommission(memberAccountLog == null ? zero : memberAccountLog.getAccountSum()); vo.withdrawnCommission = memberAccountLog == null ? zero : memberAccountLog.accountSum;
} }
return vo; return vo;
} }
@@ -115,14 +115,14 @@ export class MemberAccountServiceImplService {
if (CommonUtils.isNotEmpty(searchParam.memberId) && searchParam.memberId > 0) { if (CommonUtils.isNotEmpty(searchParam.memberId) && searchParam.memberId > 0) {
const memberAccountInfo: MemberAccountVo = this.getMemberAccountInfo(searchParam.memberId); const memberAccountInfo: MemberAccountVo = this.getMemberAccountInfo(searchParam.memberId);
vo.setBalance(memberAccountInfo == null ? new BigDecimal(0) : memberAccountInfo.getBalance()); vo.balance = memberAccountInfo == null ? new BigDecimal(0 : memberAccountInfo.balance);
vo.setMoney(memberAccountInfo == null ? new BigDecimal(0) : memberAccountInfo.getMoney()); vo.money = memberAccountInfo == null ? new BigDecimal(0 : memberAccountInfo.money);
} else { } else {
const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS balance,SUM(money) AS money") const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS balance,SUM(money) AS money")
.eq("site_id", siteId)); .eq("site_id", siteId));
vo.setBalance(member == null ? new BigDecimal(0) : member.getBalance()); vo.balance = member == null ? new BigDecimal(0 : member.balance);
vo.setMoney(member == null ? new BigDecimal(0) : member.getMoney()); vo.money = member == null ? new BigDecimal(0 : member.money);
} }
return vo; return vo;
@@ -142,18 +142,18 @@ export class MemberAccountServiceImplService {
.eq("member_id", searchParam.memberId) .eq("member_id", searchParam.memberId)
.eq("account_type", AccountTypeEnum.POINT.type) .eq("account_type", AccountTypeEnum.POINT.type)
.lt("account_data", 0)); .lt("account_data", 0));
vo.setPointGet(memberAccountInfo.getPointGet()); vo.pointGet = memberAccountInfo.pointGet;
vo.setPointUse(memberAccountLog == null ? 0 : memberAccountLog.getAccountSum().abs().intValue()); vo.pointUse = memberAccountLog == null ? 0 : memberAccountLog.accountSum.abs(.intValue());
} else { } else {
const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS point_get") const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS point_get")
.eq("site_id", siteId)); .eq("site_id", siteId));
vo.setPointGet(member == null ? 0 : member.getPointGet()); vo.pointGet = member == null ? 0 : member.pointGet;
const memberAccountLog: MemberAccountLog = this.memberAccountLogRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS account_sum") const memberAccountLog: MemberAccountLog = this.memberAccountLogRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS account_sum")
.eq("site_id", siteId) .eq("site_id", siteId)
.eq("account_type", AccountTypeEnum.POINT.type) .eq("account_type", AccountTypeEnum.POINT.type)
.lt("account_data", 0)); .lt("account_data", 0));
vo.setPointUse(memberAccountLog == null ? 0 : memberAccountLog.getAccountSum().abs().intValue()); vo.pointUse = memberAccountLog == null ? 0 : memberAccountLog.accountSum.abs(.intValue());
} }
return vo; return vo;
@@ -163,13 +163,13 @@ export class MemberAccountServiceImplService {
* adjustPoint * adjustPoint
*/ */
async adjustPoint(param: AdjustAccountParam): Promise<any> { async adjustPoint(param: AdjustAccountParam): Promise<any> {
this.coreMemberAccountService.addLog(this.requestContext.siteId, param.memberId, AccountTypeEnum.POINT.type, param.getAccountData(), "adjust", param.getMemo(), ""); this.coreMemberAccountService.addLog(this.requestContext.siteId, param.memberId, AccountTypeEnum.POINT.type, param.accountData, "adjust", param.memo, "");
} }
/** /**
* adjustBalance * adjustBalance
*/ */
async adjustBalance(param: AdjustAccountParam): Promise<any> { async adjustBalance(param: AdjustAccountParam): Promise<any> {
this.coreMemberAccountService.addLog(this.requestContext.siteId, param.memberId, AccountTypeEnum.BALANCE.type, param.getAccountData(), "adjust", param.getMemo(), ""); this.coreMemberAccountService.addLog(this.requestContext.siteId, param.memberId, AccountTypeEnum.BALANCE.type, param.accountData, "adjust", param.memo, "");
} }
} }

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

@@ -25,30 +25,30 @@ export class MemberCashOutServiceImplService {
const limit: number = pageParam.limit; const limit: number = pageParam.limit;
MPJany /* TODO: QueryWrapper<MemberCashOut> */ queryWrapper = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<MemberCashOut> */ queryWrapper = new MPJQueryWrapper();
queryWrapper.setAlias("mco").innerJoin("?_member m ON mco.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix)); queryWrapper.alias = "mco".innerJoin("?_member m ON mco.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
queryWrapper.select("mco.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg"); queryWrapper.select("mco.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg");
queryWrapper.eq("mco.site_id", siteId); queryWrapper.eq("mco.site_id", siteId);
queryWrapper.orderByDesc("mco.id"); queryWrapper.orderByDesc("mco.id");
if (CommonUtils.isNotEmpty(searchParam.getKeywords())) { if (CommonUtils.isNotEmpty(searchParam.keywords)) {
queryWrapper.and(i => i.like("m.member_no", searchParam.getKeywords()) queryWrapper.and(i => i.like("m.member_no", searchParam.keywords)
.or().like("m.username", searchParam.getKeywords()) .or().like("m.username", searchParam.keywords)
.or().like("m.nickname", searchParam.getKeywords()) .or().like("m.nickname", searchParam.keywords)
.or().like("m.mobile", searchParam.getKeywords()) .or().like("m.mobile", searchParam.keywords)
); );
} }
if (CommonUtils.isNotEmpty(searchParam.memberId) && searchParam.memberId > 0) queryWrapper.eq("mco.member_id", searchParam.memberId); if (CommonUtils.isNotEmpty(searchParam.memberId) && searchParam.memberId > 0) queryWrapper.eq("mco.member_id", searchParam.memberId);
if (CommonUtils.isNotEmpty(searchParam.status)) queryWrapper.eq("mco.status", searchParam.status); if (CommonUtils.isNotEmpty(searchParam.status)) queryWrapper.eq("mco.status", searchParam.status);
if (CommonUtils.isNotEmpty(searchParam.getCashOutNo())) queryWrapper.like("mco.cash_out_no", searchParam.getCashOutNo()); if (CommonUtils.isNotEmpty(searchParam.cashOutNo)) queryWrapper.like("mco.cash_out_no", searchParam.cashOutNo);
if (CommonUtils.isNotEmpty(searchParam.getTransferType())) queryWrapper.like("mco.transfer_type", searchParam.getTransferType()); if (CommonUtils.isNotEmpty(searchParam.transferType)) queryWrapper.like("mco.transfer_type", searchParam.transferType);
if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper, "mco.create_time", searchParam.createTime); if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper, "mco.create_time", searchParam.createTime);
if (CommonUtils.isNotEmpty(searchParam.getTransferTime())) QueryMapperUtils.buildByTime(queryWrapper, "mco.transfer_time", searchParam.getTransferTime()); if (CommonUtils.isNotEmpty(searchParam.transferTime)) QueryMapperUtils.buildByTime(queryWrapper, "mco.transfer_time", searchParam.transferTime);
[MemberCashOutListVo[], number] iPage = memberCashOutMapper.selectJoinPage(new Page<>(page, limit), MemberCashOutListVo.class, queryWrapper); [MemberCashOutListVo[], number] iPage = memberCashOutMapper.selectJoinPage(new Page<>(page, limit), MemberCashOutListVo.class, queryWrapper);
for (const item of iPageRecords) { for (const item of iPageRecords) {
const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo(); const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo();
Object.assign(memberInfoVo, item); Object.assign(memberInfoVo, item);
item.setMember(memberInfoVo); item.member = memberInfoVo;
} }
return PageResult.build(page, limit, iPageTotal).setData(iPageRecords); return PageResult.build(page, limit, iPageTotal).setData(iPageRecords);
} }
@@ -72,10 +72,10 @@ export class MemberCashOutServiceImplService {
if (vo != null) { if (vo != null) {
MemberCashOutInfoVo.const transfer: Transfer = new MemberCashOutInfoVo.Transfer(); MemberCashOutInfoVo.const transfer: Transfer = new MemberCashOutInfoVo.Transfer();
transfer.setTransferNo(vo.getTransferNo()); transfer.transferNo = vo.transferNo;
transfer.setTransferRemark(vo.getTransferRemark()); transfer.transferRemark = vo.transferRemark;
transfer.setTransferVoucher(vo.getTransferVoucher()); transfer.transferVoucher = vo.transferVoucher;
vo.setTransfer(transfer); vo.transfer = transfer;
} }
return vo; return vo;
@@ -99,11 +99,11 @@ export class MemberCashOutServiceImplService {
.last("limit 1")); .last("limit 1"));
const zero: BigDecimal = new BigDecimal(0); const zero: BigDecimal = new BigDecimal(0);
vo.setTransfered(transfered == null ? zero : transfered.getApplyMoney()); vo.transfered = transfered == null ? zero : transfered.applyMoney;
if (allMoney != null) { if (allMoney != null) {
vo.setCashOuting(allMoney.getApplyMoney().subtract(vo.getTransfered())); vo.cashOuting = allMoney.applyMoney.subtract(vo.transfered);
} else { } else {
vo.setCashOuting(zero); vo.cashOuting = zero;
} }
return vo; return vo;
} }
@@ -146,7 +146,7 @@ export class MemberCashOutServiceImplService {
); );
if (!model) throw new BadRequestException("数据不存在"); if (!model) throw new BadRequestException("数据不存在");
model.setRemark(param.getRemark()); model.remark = param.remark;
memberCashOutMapper.updateById(model); memberCashOutMapper.updateById(model);
} }

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

@@ -25,7 +25,7 @@ export class MemberConfigServiceImplService {
* setLoginConfig * setLoginConfig
*/ */
async setLoginConfig(configParam: LoginConfigParam): Promise<any> { async setLoginConfig(configParam: LoginConfigParam): Promise<any> {
this.this.CoreMemberConfigService.setLoginConfig(this.requestContext.siteId, configParam); this.this.CoreMemberConfigService.loginConfig = this.requestContext.siteId, configParam;
} }
/** /**
@@ -39,7 +39,7 @@ export class MemberConfigServiceImplService {
* setCashOutConfig * setCashOutConfig
*/ */
async setCashOutConfig(configParam: CashOutConfigParam): Promise<any> { async setCashOutConfig(configParam: CashOutConfigParam): Promise<any> {
this.this.CoreMemberConfigService.setCashOutConfig(this.requestContext.siteId, configParam); this.this.CoreMemberConfigService.cashOutConfig = this.requestContext.siteId, configParam;
} }
/** /**
@@ -53,7 +53,7 @@ export class MemberConfigServiceImplService {
* setMemberConfig * setMemberConfig
*/ */
async setMemberConfig(configParam: MemberConfigParam): Promise<any> { async setMemberConfig(configParam: MemberConfigParam): Promise<any> {
this.this.CoreMemberConfigService.setMemberConfig(this.requestContext.siteId, configParam); this.this.CoreMemberConfigService.memberConfig = this.requestContext.siteId, configParam;
} }
/** /**
@@ -67,7 +67,7 @@ export class MemberConfigServiceImplService {
* setGrowthRuleConfig * setGrowthRuleConfig
*/ */
async setGrowthRuleConfig(configParam: JSONObject): Promise<any> { async setGrowthRuleConfig(configParam: JSONObject): Promise<any> {
this.this.CoreMemberConfigService.setGrowthRuleConfig(this.requestContext.siteId, configParam); this.this.CoreMemberConfigService.growthRuleConfig = this.requestContext.siteId, configParam;
} }
/** /**
@@ -81,6 +81,6 @@ export class MemberConfigServiceImplService {
* setPointRuleConfig * setPointRuleConfig
*/ */
async setPointRuleConfig(configParam: JSONObject): Promise<any> { async setPointRuleConfig(configParam: JSONObject): Promise<any> {
this.this.CoreMemberConfigService.setPointRuleConfig(this.requestContext.siteId, configParam); this.this.CoreMemberConfigService.pointRuleConfig = this.requestContext.siteId, configParam;
} }
} }

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

@@ -25,14 +25,14 @@ export class MemberLabelServiceImplService {
any /* TODO: QueryWrapper<MemberLabel> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<MemberLabel> */ queryWrapper = new QueryWrapper();
queryWrapper.eq("site_id", siteId); queryWrapper.eq("site_id", siteId);
queryWrapper.orderByDesc("label_id"); queryWrapper.orderByDesc("label_id");
if (CommonUtils.isNotEmpty(searchParam.getLabelName())){ if (CommonUtils.isNotEmpty(searchParam.labelName)){
queryWrapper.like("label_name", searchParam.getLabelName()); queryWrapper.like("label_name", searchParam.labelName);
} }
[MemberLabel[], number] iPage = this.memberLabelRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); [MemberLabel[], number] iPage = this.memberLabelRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
const list: MemberLabelListVo[] = []; const list: MemberLabelListVo[] = [];
for (const item of iPageRecords) { for (const item of iPageRecords) {
const vo: MemberLabelListVo = new MemberLabelListVo(); const vo: MemberLabelListVo = new MemberLabelListVo();
const labelId: number = item.getLabelId(); const labelId: number = item.labelId;
any /* TODO: QueryWrapper<Member> */ wrapper = new QueryWrapper(); any /* TODO: QueryWrapper<Member> */ wrapper = new QueryWrapper();
wrapper.eq("site_id",siteId); wrapper.eq("site_id",siteId);
const canshu: string = String(labelId); const canshu: string = String(labelId);
@@ -40,7 +40,7 @@ export class MemberLabelServiceImplService {
wrapper.apply("JSON_VALID(member_label) = 1 AND JSON_SEARCH(member_label, 'one', {0}) IS NOT NULL",canshu); wrapper.apply("JSON_VALID(member_label) = 1 AND JSON_SEARCH(member_label, 'one', {0}) IS NOT NULL",canshu);
const members: Member[] = this.memberRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); const members: Member[] = this.memberRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
Object.assign(vo, item); Object.assign(vo, item);
vo.setMemberNum(members.length); vo.memberNum = members.length;
list.push(vo); list.push(vo);
} }
return PageResult.build(page, limit, iPageTotal).setData(list); return PageResult.build(page, limit, iPageTotal).setData(list);
@@ -71,9 +71,9 @@ export class MemberLabelServiceImplService {
const model: MemberLabel = new MemberLabel(); const model: MemberLabel = new MemberLabel();
model.siteId = siteId; model.siteId = siteId;
model.setLabelName(addParam.getLabelName()); model.labelName = addParam.labelName;
model.setMemo(addParam.getMemo()); model.memo = addParam.memo;
model.setSort(addParam.getSort()); model.sort = addParam.sort;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
this.memberLabelRepository.save(model); this.memberLabelRepository.save(model);
@@ -90,9 +90,9 @@ export class MemberLabelServiceImplService {
.eq("label_id", id); .eq("label_id", id);
const model: MemberLabel = new MemberLabel(); const model: MemberLabel = new MemberLabel();
model.setLabelName(editParam.getLabelName()); model.labelName = editParam.labelName;
model.setMemo(editParam.getMemo()); model.memo = editParam.memo;
model.setSort(editParam.getSort()); model.sort = editParam.sort;
model.updateTime = Date.now( / 1000); model.updateTime = Date.now( / 1000);
this.memberLabelRepository.save(model, updateWrapper); this.memberLabelRepository.save(model, updateWrapper);

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

@@ -24,16 +24,16 @@ export class MemberLevelServiceImplService {
any /* TODO: QueryWrapper<MemberLevel> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<MemberLevel> */ queryWrapper = new QueryWrapper();
queryWrapper.eq("site_id", siteId); queryWrapper.eq("site_id", siteId);
queryWrapper.orderByAsc("growth"); queryWrapper.orderByAsc("growth");
if (CommonUtils.isNotEmpty(searchParam.getLevelName())) queryWrapper.like("level_name", searchParam.getLevelName()); if (CommonUtils.isNotEmpty(searchParam.levelName)) queryWrapper.like("level_name", searchParam.levelName);
[MemberLevel[], number] iPage = this.memberLevelRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); [MemberLevel[], number] iPage = this.memberLevelRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
const list: MemberLevelListVo[] = []; const list: MemberLevelListVo[] = [];
for (const item of iPageRecords) { for (const item of iPageRecords) {
const vo: MemberLevelListVo = new MemberLevelListVo(); const vo: MemberLevelListVo = new MemberLevelListVo();
Object.assign(vo, item); Object.assign(vo, item);
vo.setMemberNum(this.memberRepository.count({ /* TODO: 将QueryWrapper改为where条件 */ })))); vo.memberNum = this.memberRepository.count({ /* TODO: 将QueryWrapper改为where条件 */ })));
if (CommonUtils.isNotEmpty(item.getLevelBenefits())) vo.setLevelBenefits(this.coreMemberService.getBenefitsContent(item.siteId, JsonUtils.parseObject<any>(item.getLevelBenefits()), "admin")); if (CommonUtils.isNotEmpty(item.levelBenefits)) vo.levelBenefits = this.coreMemberService.getBenefitsContent(item.siteId, JsonUtils.parseObject<any>(item.levelBenefits, "admin"));
if (CommonUtils.isNotEmpty(item.getLevelGifts())) vo.setLevelGifts(this.coreMemberService.getGiftContent(item.siteId, JsonUtils.parseObject<any>(item.getLevelGifts()), "admin")); if (CommonUtils.isNotEmpty(item.levelGifts)) vo.levelGifts = this.coreMemberService.getGiftContent(item.siteId, JsonUtils.parseObject<any>(item.levelGifts, "admin"));
list.push(vo); list.push(vo);
} }
return PageResult.build(page, limit, iPageTotal).setData(list); return PageResult.build(page, limit, iPageTotal).setData(list);
@@ -65,12 +65,12 @@ export class MemberLevelServiceImplService {
const model: MemberLevel = new MemberLevel(); const model: MemberLevel = new MemberLevel();
model.siteId = siteId; model.siteId = siteId;
model.setLevelName(addParam.getLevelName()); model.levelName = addParam.levelName;
model.setGrowth(addParam.getGrowth()); model.growth = addParam.growth;
model.setRemark(addParam.getRemark()); model.remark = addParam.remark;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
model.setLevelBenefits(addParam.getLevelBenefits().toString()); model.levelBenefits = addParam.levelBenefits.toString();
model.setLevelGifts(addParam.getLevelGifts().toString()); model.levelGifts = addParam.levelGifts.toString();
this.memberLevelRepository.save(model); this.memberLevelRepository.save(model);
} }
@@ -86,12 +86,12 @@ export class MemberLevelServiceImplService {
.eq("level_id", id); .eq("level_id", id);
const model: MemberLevel = new MemberLevel(); const model: MemberLevel = new MemberLevel();
model.setLevelName(editParam.getLevelName()); model.levelName = editParam.levelName;
model.setGrowth(editParam.getGrowth()); model.growth = editParam.growth;
model.setRemark(editParam.getRemark()); model.remark = editParam.remark;
model.updateTime = Date.now( / 1000); model.updateTime = Date.now( / 1000);
model.setLevelBenefits(editParam.getLevelBenefits().toString()); model.levelBenefits = editParam.levelBenefits.toString();
model.setLevelGifts(editParam.getLevelGifts().toString()); model.levelGifts = editParam.levelGifts.toString();
this.memberLevelRepository.save(model, updateWrapper); this.memberLevelRepository.save(model, updateWrapper);
} }

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

@@ -27,7 +27,7 @@ export class MemberServiceImplService {
const siteId: number = this.requestContext.siteId; const siteId: number = this.requestContext.siteId;
MPJany /* TODO: QueryWrapper<Member> */ queryWrapper = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<Member> */ queryWrapper = new MPJQueryWrapper();
queryWrapper.setAlias("m").leftJoin("?_member_level ml ON ml.level_id = m.member_level".replace("?_", this.appConfig.tablePrefix)); queryWrapper.alias = "m".leftJoin("?_member_level ml ON ml.level_id = m.member_level".replace("?_", this.appConfig.tablePrefix));
queryWrapper.select("m.*, ml.level_name as member_level_name"); queryWrapper.select("m.*, ml.level_name as member_level_name");
queryWrapper.eq("m.site_id", siteId); queryWrapper.eq("m.site_id", siteId);
queryWrapper.orderByDesc("member_id"); queryWrapper.orderByDesc("member_id");
@@ -40,20 +40,20 @@ export class MemberServiceImplService {
.like("mobile", searchParam.keyword)); .like("mobile", searchParam.keyword));
} }
if (ObjectUtil.isNotNull(searchParam.getIsDel()) && CommonUtils.isNotEmpty(searchParam.keyword)) { if (ObjectUtil.isNotNull(searchParam.isDel) && CommonUtils.isNotEmpty(searchParam.keyword)) {
queryWrapper.eq("is_del", searchParam.getIsDel()); queryWrapper.eq("is_del", searchParam.isDel);
} }
if (CommonUtils.isNotEmpty(searchParam.getMemberLevel()) && searchParam.getMemberLevel() != 0) { if (CommonUtils.isNotEmpty(searchParam.memberLevel) && searchParam.memberLevel != 0) {
queryWrapper.eq("member_level", searchParam.getMemberLevel()); queryWrapper.eq("member_level", searchParam.memberLevel);
} }
if (CommonUtils.isNotEmpty(searchParam.getRegisterChannel())) { if (CommonUtils.isNotEmpty(searchParam.registerChannel)) {
queryWrapper.eq("register_channel", searchParam.getRegisterChannel()); queryWrapper.eq("register_channel", searchParam.registerChannel);
} }
if (CommonUtils.isNotEmpty(searchParam.getMemberLabel()) && searchParam.getMemberLabel() != 0) { if (CommonUtils.isNotEmpty(searchParam.memberLabel) && searchParam.memberLabel != 0) {
queryWrapper.like("member_label", searchParam.getMemberLabel()); queryWrapper.like("member_label", searchParam.memberLabel);
} }
if (CommonUtils.isNotEmpty(searchParam.getRegisterType())) { if (CommonUtils.isNotEmpty(searchParam.registerType)) {
queryWrapper.eq("register_type", searchParam.getRegisterType()); queryWrapper.eq("register_type", searchParam.registerType);
} }
if (CommonUtils.isNotEmpty(searchParam.createTime)) { if (CommonUtils.isNotEmpty(searchParam.createTime)) {
QueryMapperUtils.buildByTime(queryWrapper, "m.create_time", searchParam.createTime); QueryMapperUtils.buildByTime(queryWrapper, "m.create_time", searchParam.createTime);
@@ -78,13 +78,13 @@ export class MemberServiceImplService {
for (const item of memberList) { for (const item of memberList) {
const vo: MemberListVo = new MemberListVo(); const vo: MemberListVo = new MemberListVo();
Object.assign(vo, item); Object.assign(vo, item);
vo.setSexName(SexEnum.getNameBySex(item.getSex())); vo.sexName = SexEnum.getNameBySex(item.sex);
vo.setStatusName(StatusEnum.getNameByStatus(item.status)); vo.statusName = StatusEnum.getNameByStatus(item.status);
vo.setRegisterChannelName(ChannelEnum.getNameByCode(item.getRegisterChannel())); vo.registerChannelName = ChannelEnum.getNameByCode(item.registerChannel);
vo.setMemberLevelName(levelMap.getOrDefault(item.getMemberLevel(), new MemberLevel()).getLevelName()); vo.memberLevelName = levelMap.getOrDefault(item.memberLevel, new MemberLevel().getLevelName());
if (!item.getMemberLabel().isEmpty()) { if (!item.memberLabel.isEmpty()) {
const memberLabelArrays: JSONArray = JSONUtil.parseArray(vo.getMemberLabel()); const memberLabelArrays: JSONArray = JSONUtil.parseArray(vo.memberLabel);
if (memberLabelArrays != null && memberLabelArrays.length > 0) { if (memberLabelArrays != null && memberLabelArrays.length > 0) {
const memberLabelArray: MemberLabelAllListVo[] = []; const memberLabelArray: MemberLabelAllListVo[] = [];
const labelList: MemberLabel[] = this.memberLabelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).in("label_id", memberLabelArrays)); const labelList: MemberLabel[] = this.memberLabelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).in("label_id", memberLabelArrays));
@@ -93,7 +93,7 @@ export class MemberServiceImplService {
Object.assign(labelVo, labelItem); Object.assign(labelVo, labelItem);
memberLabelArray.push(labelVo); memberLabelArray.push(labelVo);
} }
vo.setMemberLabelArray(memberLabelArray); vo.memberLabelArray = memberLabelArray;
} }
} }
list.push(vo); list.push(vo);
@@ -119,12 +119,12 @@ export class MemberServiceImplService {
const vo: MemberInfoVo = new MemberInfoVo(); const vo: MemberInfoVo = new MemberInfoVo();
Object.assign(vo, model); Object.assign(vo, model);
if ("0".equals(model.getMemberLevel())){ if ("0".equals(model.memberLevel)){
vo.setMemberLevel(""); vo.memberLevel = "";
} }
if (StrUtil.isNotEmpty(model.getMemberLabel()) && ![model.getMemberLabel(]).isEmpty()) { if (StrUtil.isNotEmpty(model.memberLabel) && ![model.getMemberLabel(]).isEmpty()) {
const memberLabelArrays: JSONArray = JSONUtil.parseArray(vo.getMemberLabel()); const memberLabelArrays: JSONArray = JSONUtil.parseArray(vo.memberLabel);
if (memberLabelArrays != null && memberLabelArrays.length > 0) { if (memberLabelArrays != null && memberLabelArrays.length > 0) {
const memberLabelArray: MemberLabelAllListVo[] = []; const memberLabelArray: MemberLabelAllListVo[] = [];
const labelList: MemberLabel[] = this.memberLabelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).in("label_id", memberLabelArrays)); const labelList: MemberLabel[] = this.memberLabelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).in("label_id", memberLabelArrays));
@@ -133,7 +133,7 @@ export class MemberServiceImplService {
Object.assign(labelVo, item); Object.assign(labelVo, item);
memberLabelArray.push(labelVo); memberLabelArray.push(labelVo);
} }
vo.setMemberLabelArray(memberLabelArray); vo.memberLabelArray = memberLabelArray;
} }
} }
return vo; return vo;
@@ -145,47 +145,47 @@ export class MemberServiceImplService {
async add(addParam: MemberAddParam): Promise<any> { async add(addParam: MemberAddParam): Promise<any> {
const siteId: number = this.requestContext.siteId; const siteId: number = this.requestContext.siteId;
addParam.setUsername(addParam.getMobile()); addParam.username = addParam.mobile;
const mobileIsExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) const mobileIsExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
.eq("site_id", siteId) .eq("site_id", siteId)
.and(i => i.eq("mobile", addParam.getMobile()).or().eq("username", addParam.getMobile())) .and(i => i.eq("mobile", addParam.mobile).or().eq("username", addParam.mobile))
.last("limit 1")); .last("limit 1"));
Assert.isNull(mobileIsExist, "手机号已存在"); Assert.isNull(mobileIsExist, "手机号已存在");
if (addParam.getNickname().length() == 0 & addParam.getMobile().length() > 0) { if (addParam.nickname.length() == 0 & addParam.mobile.length() > 0) {
addParam.setNickname(addParam.getMobile().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")); addParam.nickname = addParam.mobile.replaceAll("(\\d{3}\\d{4}(\\d{4})", "$1****$2"));
} }
if (addParam.getMemberNo().isEmpty()) { if (addParam.memberNo.isEmpty()) {
addParam.setMemberNo(this.this.CoreMemberService.createMemberNo(siteId)); addParam.memberNo = this.this.CoreMemberService.createMemberNo(siteId);
} else { } else {
const memberNoIsExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) const memberNoIsExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
.eq("site_id", siteId) .eq("site_id", siteId)
.eq("member_no", addParam.getMemberNo()) .eq("member_no", addParam.memberNo)
.last("limit 1")); .last("limit 1"));
Assert.isNull(memberNoIsExist, "会员编码已存在"); Assert.isNull(memberNoIsExist, "会员编码已存在");
} }
const model: Member = new Member(); const model: Member = new Member();
model.siteId = siteId; model.siteId = siteId;
model.setMobile(addParam.getMobile()); model.mobile = addParam.mobile;
model.setMemberNo(addParam.getMemberNo()); model.memberNo = addParam.memberNo;
model.setUsername(addParam.getUsername()); model.username = addParam.username;
model.setNickname(addParam.getNickname()); model.nickname = addParam.nickname;
model.setHeadimg(addParam.getHeadimg()); model.headimg = addParam.headimg;
model.setPassword(PasswordEncipher.encode(addParam.getPassword())); model.password = PasswordEncipher.encode(addParam.password);
model.setRegisterType(MemberRegisterTypeEnum.MANUAL.type); model.registerType = MemberRegisterTypeEnum.MANUAL.type;
model.setRegisterChannel(MemberRegisterChannelEnum.MANUAL.type); model.registerChannel = MemberRegisterChannelEnum.MANUAL.type;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
model.setMemberLabel("[]"); model.memberLabel = "[]";
this.memberRepository.save(model); this.memberRepository.save(model);
// 会员注册事件 // 会员注册事件
const registerEvent: MemberRegisterEvent = new MemberRegisterEvent(); const registerEvent: MemberRegisterEvent = new MemberRegisterEvent();
registerEvent.siteId = this.requestContext.siteId; registerEvent.siteId = this.requestContext.siteId;
registerEvent.addAppSign("shop_fenxiao"); registerEvent.addAppSign("shop_fenxiao");
registerEvent.name = "MemberRegisterEvent"; registerEvent.name = "MemberRegisterEvent";
registerEvent.setMember(model); registerEvent.member = model;
EventPublisher.publishEvent(registerEvent); EventPublisher.publishEvent(registerEvent);
} }
@@ -200,11 +200,11 @@ export class MemberServiceImplService {
.eq("member_id", id); .eq("member_id", id);
const model: Member = new Member(); const model: Member = new Member();
model.setNickname(editParam.getNickname()); model.nickname = editParam.nickname;
model.setHeadimg(editParam.getHeadimg()); model.headimg = editParam.headimg;
model.setPassword(editParam.getPassword()); model.password = editParam.password;
model.setSex(editParam.getSex()); model.sex = editParam.sex;
model.setBirthday(editParam.getBirthday()); model.birthday = editParam.birthday;
this.memberRepository.save(model, updateWrapper); this.memberRepository.save(model, updateWrapper);
} }
@@ -213,8 +213,8 @@ export class MemberServiceImplService {
* modify * modify
*/ */
async modify(editParam: MemberModifyParam): Promise<any> { async modify(editParam: MemberModifyParam): Promise<any> {
if (editParam == null || editParam.getField() == null || editParam.value == null) { if (editParam == null || editParam.field == null || editParam.value == null) {
if(editParam.getField() === "member_label"){ if(editParam.field === "member_label"){
throw new AdminException("修改参数不能为空"); throw new AdminException("修改参数不能为空");
} }
} }
@@ -226,7 +226,7 @@ export class MemberServiceImplService {
updateWrapper.eq(Member::getSiteId, siteId) updateWrapper.eq(Member::getSiteId, siteId)
.eq(Member::getMemberId, editParam.memberId); .eq(Member::getMemberId, editParam.memberId);
switch (editParam.getField()) { switch (editParam.field) {
case "nickname": case "nickname":
updateWrapper.set(Member::getNickname, value === "" || value === "null" ? "" : value); updateWrapper.set(Member::getNickname, value === "" || value === "null" ? "" : value);
break; break;
@@ -308,7 +308,7 @@ export class MemberServiceImplService {
const siteId: number = this.requestContext.siteId; const siteId: number = this.requestContext.siteId;
UpdateWrapper<Member> updateWrapper = new UpdateWrapper(); UpdateWrapper<Member> updateWrapper = new UpdateWrapper();
updateWrapper.in("member_id", param.getMemberIds()); updateWrapper.in("member_id", param.memberIds);
updateWrapper.eq("site_id", siteId); updateWrapper.eq("site_id", siteId);
const updateMember: Member = new Member(); const updateMember: Member = new Member();
@@ -344,9 +344,9 @@ export class MemberServiceImplService {
if (CommonUtils.isEmpty(param.value.toString())){ if (CommonUtils.isEmpty(param.value.toString())){
return; return;
} }
const field: string = param.getField(); const field: string = param.field;
const memberIds: number[] = param.getMemberIds(); const memberIds: number[] = param.memberIds;
const isAll: number = param.getIsAll(); const isAll: number = param.isAll;
if (!"member_label".equals(field) && !"member_level".equals(field)){ if (!"member_label".equals(field) && !"member_level".equals(field)){
throw new BadRequestException("不支持的字段:" + field); throw new BadRequestException("不支持的字段:" + field);
} }

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

@@ -23,14 +23,14 @@ export class MemberSignServiceImplService {
const limit: number = pageParam.limit; const limit: number = pageParam.limit;
MPJany /* TODO: QueryWrapper<MemberSign> */ queryWrapper = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<MemberSign> */ queryWrapper = new MPJQueryWrapper();
queryWrapper.setAlias("ms").innerJoin("?_member m ON ms.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix)); queryWrapper.alias = "ms".innerJoin("?_member m ON ms.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
queryWrapper.select("ms.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg"); queryWrapper.select("ms.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg");
queryWrapper.eq("ms.site_id", siteId); queryWrapper.eq("ms.site_id", siteId);
queryWrapper.orderByDesc("ms.sign_id"); queryWrapper.orderByDesc("ms.sign_id");
if (CommonUtils.isNotEmpty(searchParam.getKeywords())){ if (CommonUtils.isNotEmpty(searchParam.keywords)){
// queryWrapper.like("m.member_no|m.username|m.nickname|m.mobile", searchParam.getKeywords()); // queryWrapper.like("m.member_no|m.username|m.nickname|m.mobile", searchParam.keywords);
QueryMapperUtils.addMultiLike(queryWrapper, searchParam.getKeywords(), QueryMapperUtils.addMultiLike(queryWrapper, searchParam.keywords,
"m.member_no", "m.username", "m.nickname", "m.mobile"); "m.member_no", "m.username", "m.nickname", "m.mobile");
} }
if (CommonUtils.isNotEmpty(searchParam.createTime)) { if (CommonUtils.isNotEmpty(searchParam.createTime)) {
@@ -43,16 +43,16 @@ export class MemberSignServiceImplService {
const vo: MemberSignListVo = new MemberSignListVo(); const vo: MemberSignListVo = new MemberSignListVo();
Object.assign(vo, item); Object.assign(vo, item);
if (!item.getDayAward().isEmpty()) { if (!item.dayAward.isEmpty()) {
vo.setDayAward(this.coreMemberService.getGiftContent(item.siteId, JsonUtils.parseObject<any>(item.getDayAward()), "admin")); vo.dayAward = this.coreMemberService.getGiftContent(item.siteId, JsonUtils.parseObject<any>(item.dayAward, "admin"));
} }
if (!item.getContinueAward().isEmpty()) { if (!item.continueAward.isEmpty()) {
vo.setContinueAward(this.coreMemberService.getGiftContent(item.siteId, JsonUtils.parseObject<any>(item.getContinueAward()), "admin")); vo.continueAward = this.coreMemberService.getGiftContent(item.siteId, JsonUtils.parseObject<any>(item.continueAward, "admin"));
} }
const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo(); const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo();
Object.assign(memberInfoVo, item); Object.assign(memberInfoVo, item);
vo.setMember(memberInfoVo); vo.member = memberInfoVo;
list.push(vo); list.push(vo);
} }
return PageResult.build(page, limit, iPageTotal).setData(list); return PageResult.build(page, limit, iPageTotal).setData(list);
@@ -70,6 +70,6 @@ export class MemberSignServiceImplService {
* setSignConfig * setSignConfig
*/ */
async setSignConfig(configParam: SignConfigParam): Promise<any> { async setSignConfig(configParam: SignConfigParam): Promise<any> {
this.this.CoreConfigService.setConfig(this.requestContext.siteId, "SIGN_CONFIG", JsonUtils.parseObject<any>(configParam)); this.this.CoreConfigService.config = this.requestContext.siteId, "SIGN_CONFIG", JsonUtils.parseObject<any>(configParam);
} }
} }

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

@@ -56,14 +56,14 @@ export class CloudBuildServiceImplService {
const zipFile: string = ZipUtil.zip(packageDir, tempDir + "build.zip"); const zipFile: string = ZipUtil.zip(packageDir, tempDir + "build.zip");
const instance: NiucloudUtils = NiucloudUtils.getInstance(); const instance: NiucloudUtils = NiucloudUtils.instance;
const actionQuery: Record<String, Object> = new const query: Record<>(); const actionQuery: Record<String, Object> = new const query: Record<>();
actionQuery.put("data[product_key]", instance.getProductKey()); actionQuery.put("data[product_key]", instance.productKey);
const actionToken: Record<string, any> = this.niucloudService.getActionToken("cloudbuild", actionQuery); const actionToken: Record<string, any> = this.niucloudService.getActionToken("cloudbuild", actionQuery);
Record<String, Object> = {}; Record<String, Object> = {};
query.put("authorize_code", instance.getCode()); query.put("authorize_code", instance.code);
query.put("timestamp", Date.now() / 1000); query.put("timestamp", Date.now() / 1000);
query.put("token", actionToken == null ? "" : actionToken.getStr("token")); query.put("token", actionToken == null ? "" : actionToken.getStr("token"));
@@ -92,10 +92,10 @@ export class CloudBuildServiceImplService {
if (this.buildTask == null) return null; if (this.buildTask == null) return null;
if (!this.buildTask.getStr("mode").equals(mode)) return null; if (!this.buildTask.getStr("mode").equals(mode)) return null;
const instance: NiucloudUtils = NiucloudUtils.getInstance(); const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<String, Object> = {};
query.put("authorize_code", instance.getCode()); query.put("authorize_code", instance.code);
query.put("timestamp", this.buildTask.getStr("timestamp")); query.put("timestamp", this.buildTask.getStr("timestamp"));
const response: HttpResponse = new NiucloudUtils.Cloud().useThirdBuild().build("cloud/get_build_logs").query(query).method(Method.GET).execute(); const response: HttpResponse = new NiucloudUtils.Cloud().useThirdBuild().build("cloud/get_build_logs").query(query).method(Method.GET).execute();
@@ -118,7 +118,7 @@ export class CloudBuildServiceImplService {
*/ */
async setLocalCloudCompileConfig(param: ConnectTestParam): Promise<any> { async setLocalCloudCompileConfig(param: ConnectTestParam): Promise<any> {
const jsonObject: Record<string, any> = JsonUtils.parseObject<any>(JSONUtil.toJsonPrettyStr(param)); const jsonObject: Record<string, any> = JsonUtils.parseObject<any>(JSONUtil.toJsonPrettyStr(param));
this.coreConfigService.setConfig(RequestUtils.defaultSiteId(), "LOCAL_CLOUD_COMPILE_CONFIG", jsonObject); this.coreConfigService.config = RequestUtils.defaultSiteId(, "LOCAL_CLOUD_COMPILE_CONFIG", jsonObject);
} }
/** /**

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

@@ -17,17 +17,17 @@ export class NiuCloudServiceImplService {
* getFrameworkLastVersion * getFrameworkLastVersion
*/ */
async getFrameworkLastVersion(): Promise<any> { async getFrameworkLastVersion(): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.getInstance(); const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<String, Object> = {};
query.put("product_key", instance.getProductKey()); query.put("product_key", instance.productKey);
const data: Record<string, any> = NiucloudUtils.Niucloud.get("store/framework/lastversion", query).getRecord<string, any>("data"); const data: Record<string, any> = NiucloudUtils.Niucloud.get("store/framework/lastversion", query).getRecord<string, any>("data");
const frameWorkVersion: FrameWorkVersion = new FrameWorkVersion(); const frameWorkVersion: FrameWorkVersion = new FrameWorkVersion();
if (data != null) { if (data != null) {
frameWorkVersion.setLastVersion(data.getStr("last_version", "")); frameWorkVersion.lastVersion = data.getStr("last_version", "");
frameWorkVersion.setLastUpdateTime(data.getStr("last_update_time", "")); frameWorkVersion.lastUpdateTime = data.getStr("last_update_time", "");
} }
return frameWorkVersion; return frameWorkVersion;
@@ -37,10 +37,10 @@ export class NiuCloudServiceImplService {
* getFrameworkVersionList * getFrameworkVersionList
*/ */
async getFrameworkVersionList(): Promise<any> { async getFrameworkVersionList(): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.getInstance(); const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<String, Object> = {};
query.put("product_key", instance.getProductKey()); query.put("product_key", instance.productKey);
const data: JSONArray = NiucloudUtils.Niucloud.get("store/framework/version", query).getJSONArray("data"); const data: JSONArray = NiucloudUtils.Niucloud.get("store/framework/version", query).getJSONArray("data");
if (data == null) return null; if (data == null) return null;
@@ -56,12 +56,12 @@ export class NiuCloudServiceImplService {
* getAuthinfo * getAuthinfo
*/ */
async getAuthinfo(): Promise<any> { async getAuthinfo(): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.getInstance(); const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<String, Object> = {};
query.put("code", instance.getCode()); query.put("code", instance.code);
query.put("secret", instance.getSecret()); query.put("secret", instance.secret);
query.put("product_key", instance.getProductKey()); query.put("product_key", instance.productKey);
const authInfo: Record<string, any> = NiucloudUtils.Niucloud.get("authinfo", query).getRecord<string, any>("data"); const authInfo: Record<string, any> = NiucloudUtils.Niucloud.get("authinfo", query).getRecord<string, any>("data");
if (authInfo == null) return null; if (authInfo == null) return null;
@@ -76,17 +76,17 @@ export class NiuCloudServiceImplService {
* setAuthorize * setAuthorize
*/ */
async setAuthorize(param: SetAuthorizeParam): Promise<any> { async setAuthorize(param: SetAuthorizeParam): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.getInstance(); const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<String, Object> = {};
query.put("code", param.getAuthCode()); query.put("code", param.authCode);
query.put("secret", param.getAuthSecret()); query.put("secret", param.authSecret);
query.put("product_key", instance.getProductKey()); query.put("product_key", instance.productKey);
const authInfo: Record<string, any> = NiucloudUtils.Niucloud.get("authinfo", query).getRecord<string, any>("data"); const authInfo: Record<string, any> = NiucloudUtils.Niucloud.get("authinfo", query).getRecord<string, any>("data");
if (authInfo == null) throw new BadRequestException("未获取到授权信息"); if (authInfo == null) throw new BadRequestException("未获取到授权信息");
this.coreNiucloudConfigService.setNiucloudConfig(param); this.coreNiucloudConfigService.niucloudConfig = param;
NiucloudUtils.Niucloud.clearAccessToken(); NiucloudUtils.Niucloud.clearAccessToken();
} }
@@ -94,12 +94,12 @@ export class NiuCloudServiceImplService {
* getModuleList * getModuleList
*/ */
async getModuleList(): Promise<any> { async getModuleList(): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.getInstance(); const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<String, Object> = {};
query.put("code", instance.getCode()); query.put("code", instance.code);
query.put("secret", instance.getSecret()); query.put("secret", instance.secret);
query.put("product_key", instance.getProductKey()); query.put("product_key", instance.productKey);
const addonList: JSONArray = NiucloudUtils.Niucloud.get("member_app_all", query).getJSONArray("data"); const addonList: JSONArray = NiucloudUtils.Niucloud.get("member_app_all", query).getJSONArray("data");
if (addonList == null && addonList.length == 0) return null; if (addonList == null && addonList.length == 0) return null;
@@ -124,10 +124,10 @@ export class NiuCloudServiceImplService {
* checkKey * checkKey
*/ */
async checkKey(key: string): Promise<any> { async checkKey(key: string): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.getInstance(); const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<String, Object> = {};
query.put("product_key", instance.getProductKey()); query.put("product_key", instance.productKey);
return NiucloudUtils.Niucloud.get("store/app_check/" + key, query).get("data", boolean.class); return NiucloudUtils.Niucloud.get("store/app_check/" + key, query).get("data", boolean.class);
} }
@@ -136,10 +136,10 @@ export class NiuCloudServiceImplService {
* getAppVersionList * getAppVersionList
*/ */
async getAppVersionList(param: GetAppVersionListParam): Promise<any> { async getAppVersionList(param: GetAppVersionListParam): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.getInstance(); const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<String, Object> = {};
query.put("product_key", instance.getProductKey()); query.put("product_key", instance.productKey);
query.put("app_key", param.appKey); query.put("app_key", param.appKey);
const data: JSONArray = ObjectUtil.defaultIfNull(NiucloudUtils.Niucloud.get("store/app_version/list", query).get("data", JSONArray.class), new JSONArray()); const data: JSONArray = ObjectUtil.defaultIfNull(NiucloudUtils.Niucloud.get("store/app_version/list", query).get("data", JSONArray.class), new JSONArray());

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

@@ -45,9 +45,9 @@ export class NuiSmsServiceImplService {
*/ */
async sendMobileCode(param: SendMobileCodeParam): Promise<any> { async sendMobileCode(param: SendMobileCodeParam): Promise<any> {
const body: Record<String, String> = {}; const body: Record<String, String> = {};
body.put("mobile", param.getMobile()); body.put("mobile", param.mobile);
body.put("captcha_key", param.getCaptchaKey()); body.put("captcha_key", param.captchaKey);
body.put("captcha_code", param.getCaptchaCode()); body.put("captcha_code", param.captchaCode);
try { try {
const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.post(SEND_CODE_URL, body); const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.post(SEND_CODE_URL, body);
const result: Record<string, any> = jsonObject.getRecord<string, any>("data"); const result: Record<string, any> = jsonObject.getRecord<string, any>("data");
@@ -64,8 +64,8 @@ export class NuiSmsServiceImplService {
* registerAccount * registerAccount
*/ */
async registerAccount(param: RegisterAccountParam): Promise<number> { async registerAccount(param: RegisterAccountParam): Promise<number> {
if (CommonUtils.isNotEmpty(param.getImgUrl())) { if (CommonUtils.isNotEmpty(param.imgUrl)) {
param.setImgUrl(RequestUtils.getReqeustURI(, param.getImgUrl()).toString()); param.imgUrl = RequestUtils.getReqeustURI(, param.imgUrl.toString());
} }
const result: Record<string, any> = null; const result: Record<string, any> = null;
try { try {
@@ -83,18 +83,18 @@ export class NuiSmsServiceImplService {
* loginAccount * loginAccount
*/ */
async loginAccount(param: RegisterAccountParam): Promise<number> { async loginAccount(param: RegisterAccountParam): Promise<number> {
const url: string = String.format(LOGIN_ACCOUNT_URL, param.getUsername()); const url: string = String.format(LOGIN_ACCOUNT_URL, param.username);
const body: Record<String, String> = {}; const body: Record<String, String> = {};
body.put("username", param.getUsername()); body.put("username", param.username);
body.put("password", param.getPassword()); body.put("password", param.password);
try { try {
const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.post(url, body); const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.post(url, body);
const result: Record<string, any> = jsonObject.getRecord<string, any>("data"); const result: Record<string, any> = jsonObject.getRecord<string, any>("data");
if (result == null) { if (result == null) {
throw new AdminException("登录失败"); throw new AdminException("登录失败");
} }
param.setSignature(" "); param.signature = " ";
param.setDefaultVal(" "); param.defaultVal = " ";
setConfig(param); setConfig(param);
//删除null值 防止序列化报错 //删除null值 防止序列化报错
JacksonUtils.removeNull(result); JacksonUtils.removeNull(result);
@@ -111,22 +111,22 @@ export class NuiSmsServiceImplService {
async resetPassword(param: RegisterAccountParam): Promise<any> { async resetPassword(param: RegisterAccountParam): Promise<any> {
const result: Record<string, any> = new Record<string, any>(); const result: Record<string, any> = new Record<string, any>();
// 获取用户信息 // 获取用户信息
const data: Record<string, any> = accountInfo(param.getUsername()); const data: Record<string, any> = accountInfo(param.username);
// 拆分手机号并验证 // 拆分手机号并验证
const mobiles: string = String(data.getOrDefault("mobiles", "")); const mobiles: string = String(data.getOrDefault("mobiles", ""));
const mobileList: string[] = [mobiles.split(","]); const mobileList: string[] = [mobiles.split(","]);
if (!mobileList.includes(param.getMobile())) { if (!mobileList.includes(param.mobile)) {
throw new AdminException("手机号错误"); throw new AdminException("手机号错误");
} }
// 重置密码 // 重置密码
const newPassword: string = null; const newPassword: string = null;
try { try {
const resetPasswordUrl: string = String.format(RESET_PASSWORD_URL, param.getUsername()); const resetPasswordUrl: string = String.format(RESET_PASSWORD_URL, param.username);
const resetPasswordBody: Record<String, String> = {}; const resetPasswordBody: Record<String, String> = {};
resetPasswordBody.put("mobile", param.getMobile()); resetPasswordBody.put("mobile", param.mobile);
resetPasswordBody.put("code", param.getCode()); resetPasswordBody.put("code", param.code);
resetPasswordBody.put("key", param.key); resetPasswordBody.put("key", param.key);
const resetPasswordJson: Record<string, any> = NiucloudUtils.Niucloud.put(resetPasswordUrl, resetPasswordBody); const resetPasswordJson: Record<string, any> = NiucloudUtils.Niucloud.put(resetPasswordUrl, resetPasswordBody);
const resetPasswordDataJson: Record<string, any> = resetPasswordJson.getRecord<string, any>("data"); const resetPasswordDataJson: Record<string, any> = resetPasswordJson.getRecord<string, any>("data");
@@ -138,8 +138,8 @@ export class NuiSmsServiceImplService {
//修改配置 //修改配置
const registerAccountParam: RegisterAccountParam = new RegisterAccountParam(); const registerAccountParam: RegisterAccountParam = new RegisterAccountParam();
registerAccountParam.setUsername(param.getUsername()); registerAccountParam.username = param.username;
registerAccountParam.setPassword(param.getPassword()); registerAccountParam.password = param.password;
setConfig(registerAccountParam); setConfig(registerAccountParam);
result.put("password", newPassword); result.put("password", newPassword);
@@ -184,7 +184,7 @@ export class NuiSmsServiceImplService {
map = list.collect(/* Collectors已删除 */.toMap(SysNotice::getKey, item => item)); map = list.collect(/* Collectors已删除 */.toMap(SysNotice::getKey, item => item));
} }
const notice: TemplateListVo[] = []; const notice: TemplateListVo[] = [];
for (Map.Entry<String, NoticeEnumListVo> noticeMap : NoticeEnum.getNiuyunNotice().entrySet()) { for (Map.Entry<String, NoticeEnumListVo> noticeMap : NoticeEnum.niuyunNotice.entrySet()) {
const noticeInfoVo: TemplateListVo = new TemplateListVo(); const noticeInfoVo: TemplateListVo = new TemplateListVo();
BeanUtil.copyProperties(noticeMap.value, noticeInfoVo); BeanUtil.copyProperties(noticeMap.value, noticeInfoVo);
if (map.containsKey(noticeMap.key)) { if (map.containsKey(noticeMap.key)) {
@@ -194,13 +194,13 @@ export class NuiSmsServiceImplService {
if (CommonUtils.isNotEmpty(noticeMap.value.getSupport_type_map())) { if (CommonUtils.isNotEmpty(noticeMap.value.getSupport_type_map())) {
for (Map.Entry<String, Record<string, any>> supportTypeMap : noticeMap.value.getSupport_type_map().entrySet()) { for (Map.Entry<String, Record<string, any>> supportTypeMap : noticeMap.value.getSupport_type_map().entrySet()) {
if (supportTypeMap.key === "sms") { if (supportTypeMap.key === "sms") {
noticeInfoVo.setSms(supportTypeMap.value); noticeInfoVo.sms = supportTypeMap.value;
} }
if (supportTypeMap.key === "wechat") { if (supportTypeMap.key === "wechat") {
noticeInfoVo.setWechat(supportTypeMap.value); noticeInfoVo.wechat = supportTypeMap.value;
} }
if (supportTypeMap.key === "weapp") { if (supportTypeMap.key === "weapp") {
noticeInfoVo.setWeapp(supportTypeMap.value); noticeInfoVo.weapp = supportTypeMap.value;
} }
} }
} }
@@ -221,13 +221,13 @@ export class NuiSmsServiceImplService {
const result: TemplateListVo[] = []; const result: TemplateListVo[] = [];
for (const addon of addonList) { for (const addon of addonList) {
for (const noticeInfoVo of notice) { for (const noticeInfoVo of notice) {
if (addon.key === noticeInfoVo.getAddon()) { if (addon.key === noticeInfoVo.addon) {
if ("system".equals(noticeInfoVo.getAddon())) { if ("system".equals(noticeInfoVo.addon)) {
noticeInfoVo.setAddon("系统"); noticeInfoVo.addon = "系统";
} }
const auditInfo: Record<string, any> = new Record<string, any>(); const auditInfo: Record<string, any> = new Record<string, any>();
auditInfo.set("audit_msg", templateMap.containsKey(noticeInfoVo.key) ? templateMap.get(noticeInfoVo.key).getAuditMsg() : ""); 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", templateMap.containsKey(noticeInfoVo.key) ? templateMap.get(noticeInfoVo.key).getAuditStatus() : TemplateAuditStatus.TEMPLATE_NOT_REPORT.code);
auditInfo.set("audit_status_name", TemplateAuditStatus.getByCode(auditInfo.getInt("audit_status")).getDescription()); auditInfo.set("audit_status_name", TemplateAuditStatus.getByCode(auditInfo.getInt("audit_status")).getDescription());
const paramsJson: string[] = []; const paramsJson: string[] = [];
if (templateMap.containsKey(noticeInfoVo.key)){ if (templateMap.containsKey(noticeInfoVo.key)){
@@ -240,8 +240,8 @@ export class NuiSmsServiceImplService {
Collections.sort(paramsJson); Collections.sort(paramsJson);
const variable: string[] = []; const variable: string[] = [];
if (CommonUtils.isNotEmpty(noticeInfoVo.getVariable())) { if (CommonUtils.isNotEmpty(noticeInfoVo.variable)) {
variable.addAll(noticeInfoVo.getVariable().keySet()); variable.addAll(noticeInfoVo.variable.keySet());
} }
Collections.sort(variable); Collections.sort(variable);
@@ -249,11 +249,11 @@ export class NuiSmsServiceImplService {
// 比较两个键列表 // 比较两个键列表
if (templateMap.containsKey(noticeInfoVo.key) && variable !== paramsJson) { if (templateMap.containsKey(noticeInfoVo.key) && variable !== paramsJson) {
if ((!paramsJson || paramsJson.length === 0)) { if ((!paramsJson || paramsJson.length === 0)) {
errorStatus = String(TemplateAuditStatus.TEMPLATE_NEED_PULL.getCode()); errorStatus = String(TemplateAuditStatus.TEMPLATE_NEED_PULL.code);
} else { } else {
errorStatus = auditInfo.getInt("audit_status") == TemplateAuditStatus.TEMPLATE_PASS.getCode() errorStatus = auditInfo.getInt("audit_status") == TemplateAuditStatus.TEMPLATE_PASS.code
? String(TemplateAuditStatus.TEMPLATE_STATUS_AGAIN_REPORT.getCode()) ? String(TemplateAuditStatus.TEMPLATE_STATUS_AGAIN_REPORT.code)
: string.valueOf(TemplateAuditStatus.TEMPLATE_NEED_EDIT.getCode()); : string.valueOf(TemplateAuditStatus.TEMPLATE_NEED_EDIT.code);
} }
} }
auditInfo.set("error_status", errorStatus); auditInfo.set("error_status", errorStatus);
@@ -262,15 +262,15 @@ export class NuiSmsServiceImplService {
}else { }else {
auditInfo.set("error_status_name", ""); auditInfo.set("error_status_name", "");
} }
noticeInfoVo.setAuditInfo(auditInfo); noticeInfoVo.auditInfo = auditInfo;
if (templateMap.containsKey(noticeInfoVo.key)){ if (templateMap.containsKey(noticeInfoVo.key)){
const niuSmsTemplate: NiuSmsTemplate = templateMap.get(noticeInfoVo.key); const niuSmsTemplate: NiuSmsTemplate = templateMap.get(noticeInfoVo.key);
if (StringUtils.isNotEmpty(niuSmsTemplate.getTemplateType())){ if (StringUtils.isNotEmpty(niuSmsTemplate.templateType)){
noticeInfoVo.setTemplateTypeName(TemplateTypeEnum.fromCode(number.parseInt(niuSmsTemplate.getTemplateType())).getDescription()); noticeInfoVo.templateTypeName = TemplateTypeEnum.fromCode(number.parseInt(niuSmsTemplate.templateType).getDescription());
}else { }else {
noticeInfoVo.setTemplateTypeName(""); noticeInfoVo.templateTypeName = "";
} }
noticeInfoVo.setTemplateId(number.parseInt(niuSmsTemplate.getTemplateId())); noticeInfoVo.templateId = number.parseInt(niuSmsTemplate.templateId);
} }
result.push(noticeInfoVo); result.push(noticeInfoVo);
} }
@@ -287,10 +287,10 @@ export class NuiSmsServiceImplService {
const result: Record<string, any> = null; const result: Record<string, any> = null;
try { try {
const orderListParam: Record<String, Object> = {}; const orderListParam: Record<String, Object> = {};
orderListParam.put("out_trade_no", param.getOutTradeNo()); orderListParam.put("out_trade_no", param.outTradeNo);
orderListParam.put("order_status", param.status); orderListParam.put("order_status", param.status);
orderListParam.put("create_time_start", param.getCreateTimeStart()); orderListParam.put("create_time_start", param.createTimeStart);
orderListParam.put("create_time_end", param.getCreateTimeEnd()); orderListParam.put("create_time_end", param.createTimeEnd);
orderListParam.put("limit", pageParam.limit); orderListParam.put("limit", pageParam.limit);
orderListParam.put("page", pageParam.page); orderListParam.put("page", pageParam.page);
const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.get(orderListUrl, orderListParam); const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.get(orderListUrl, orderListParam);
@@ -310,9 +310,9 @@ export class NuiSmsServiceImplService {
async accountSendList(pageParam: PageParam, username: string, param: SendListParam): Promise<number> { async accountSendList(pageParam: PageParam, username: string, param: SendListParam): Promise<number> {
const accountSendUrl: string = String.format(ACCOUNT_SEND_LIST_URL, username); const accountSendUrl: string = String.format(ACCOUNT_SEND_LIST_URL, username);
const accountSendParam: Record<String, Object> = {}; const accountSendParam: Record<String, Object> = {};
accountSendParam.put("mobile", param.getMobile()); accountSendParam.put("mobile", param.mobile);
accountSendParam.put("content", param.getContent()); accountSendParam.put("content", param.content);
accountSendParam.put("smsStatus", param.getSmsStatus()); accountSendParam.put("smsStatus", param.smsStatus);
accountSendParam.put("limit", pageParam.limit); accountSendParam.put("limit", pageParam.limit);
accountSendParam.put("page", pageParam.page); accountSendParam.put("page", pageParam.page);
try { try {
@@ -344,10 +344,10 @@ export class NuiSmsServiceImplService {
(config.getRecord<string, any>(NIUYUN)).get("signature").toString().isEmpty()) { (config.getRecord<string, any>(NIUYUN)).get("signature").toString().isEmpty()) {
throw new AdminException("需登录账号并配置签名后才能启用牛云短信"); throw new AdminException("需登录账号并配置签名后才能启用牛云短信");
} }
registerAccountParam.setDefaultVal(NIUYUN); registerAccountParam.defaultVal = NIUYUN;
setConfig(registerAccountParam); setConfig(registerAccountParam);
} else { } else {
registerAccountParam.setDefaultVal(" "); registerAccountParam.defaultVal = " ";
setConfig(registerAccountParam); setConfig(registerAccountParam);
} }
} }
@@ -358,15 +358,15 @@ export class NuiSmsServiceImplService {
async editAccount(username: string, param: EditAccountParam): Promise<number> { async editAccount(username: string, param: EditAccountParam): Promise<number> {
const editAccountUrl: string = String.format(ACCOUNT_EDIT_URL, username); const editAccountUrl: string = String.format(ACCOUNT_EDIT_URL, username);
const editAccountBody: Record<String, Object> = {}; const editAccountBody: Record<String, Object> = {};
editAccountBody.put("new_mobile", param.getNewMobile()); editAccountBody.put("new_mobile", param.newMobile);
editAccountBody.put("mobile", param.getMobile()); editAccountBody.put("mobile", param.mobile);
editAccountBody.put("code", param.getCode()); editAccountBody.put("code", param.code);
editAccountBody.put("key", param.key); editAccountBody.put("key", param.key);
editAccountBody.put("signature", param.getSignature()); editAccountBody.put("signature", param.signature);
try { try {
const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.put(editAccountUrl, editAccountBody); const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.put(editAccountUrl, editAccountBody);
const registerAccountParam: RegisterAccountParam = new RegisterAccountParam(); const registerAccountParam: RegisterAccountParam = new RegisterAccountParam();
registerAccountParam.setSignature(param.getSignature()); registerAccountParam.signature = param.signature;
setConfig(registerAccountParam); setConfig(registerAccountParam);
JacksonUtils.removeNull(jsonObject); JacksonUtils.removeNull(jsonObject);
return jsonObject; return jsonObject;
@@ -381,19 +381,19 @@ export class NuiSmsServiceImplService {
*/ */
async signDelete(username: string, param: SignDeleteParam): Promise<any> { async signDelete(username: string, param: SignDeleteParam): Promise<any> {
const config: Record<string, any> = getConfig(false); const config: Record<string, any> = getConfig(false);
param.setPassword(config.getStr("password")); param.password = config.getStr("password");
try { try {
const failList: Object[] = delSign(username, param); const failList: Object[] = delSign(username, param);
const configSignature: string = config.getStr("signature"); const configSignature: string = config.getStr("signature");
const signatures: string[] = param.getSignatures(); const signatures: string[] = param.signatures;
if (signatures != null && (failList && failList.length > 0) && if (signatures != null && (failList && failList.length > 0) &&
signatures.includes(configSignature) && signatures.includes(configSignature) &&
!failList.includes(configSignature)) { !failList.includes(configSignature)) {
// 如果满足条件，则清空账户的签名 // 如果满足条件，则清空账户的签名
const editAccountParam: EditAccountParam = new EditAccountParam(); const editAccountParam: EditAccountParam = new EditAccountParam();
editAccountParam.setSignature(""); editAccountParam.signature = "";
editAccount(username, editAccountParam); editAccount(username, editAccountParam);
} }
return failList; return failList;
@@ -407,8 +407,8 @@ export class NuiSmsServiceImplService {
* signCreate * signCreate
*/ */
async signCreate(username: string, param: RegisterAccountParam): Promise<any> { async signCreate(username: string, param: RegisterAccountParam): Promise<any> {
if (CommonUtils.isNotEmpty(param.getImgUrl())) { if (CommonUtils.isNotEmpty(param.imgUrl)) {
param.setImgUrl(RequestUtils.getReqeustURI(, param.getImgUrl()).toString()); param.imgUrl = RequestUtils.getReqeustURI(, param.imgUrl.toString());
} }
const signCreateUrl: string = String.format(SIGN_ADD_URL, username); const signCreateUrl: string = String.format(SIGN_ADD_URL, username);
try { try {
@@ -429,14 +429,14 @@ export class NuiSmsServiceImplService {
*/ */
async getSmsPackageList(param: SmsPackageParam): Promise<any> { async getSmsPackageList(param: SmsPackageParam): Promise<any> {
const pageListParam: Record<String, Object> = {}; const pageListParam: Record<String, Object> = {};
pageListParam.put("package_name", param.getPackageName()); pageListParam.put("package_name", param.packageName);
pageListParam.put("sms_num", param.getSmsNum()); pageListParam.put("sms_num", param.smsNum);
pageListParam.put("price_start", param.getPriceStart()); pageListParam.put("price_start", param.priceStart);
pageListParam.put("price_end", param.getPriceEnd()); pageListParam.put("price_end", param.priceEnd);
pageListParam.put("original_price_start", param.getOriginalPriceStart()); pageListParam.put("original_price_start", param.originalPriceStart);
pageListParam.put("original_price_end", param.getOriginalPriceEnd()); pageListParam.put("original_price_end", param.originalPriceEnd);
pageListParam.put("time_start", param.getTimeStart()); pageListParam.put("time_start", param.timeStart);
pageListParam.put("time_end", param.getTimeEnd()); pageListParam.put("time_end", param.timeEnd);
pageListParam.put("page", 1); pageListParam.put("page", 1);
pageListParam.put("limit", 15); pageListParam.put("limit", 15);
try { try {
@@ -457,7 +457,7 @@ export class NuiSmsServiceImplService {
async orderCalculate(username: string, param: OrderCalculateParam): Promise<any> { async orderCalculate(username: string, param: OrderCalculateParam): Promise<any> {
const orderCalculateUrl: string = String.format(ORDER_CALCULATE_URL, username); const orderCalculateUrl: string = String.format(ORDER_CALCULATE_URL, username);
const orderCalculateBody: Record<String, Object> = {}; const orderCalculateBody: Record<String, Object> = {};
orderCalculateBody.put("package_id", param.getPackageId()); orderCalculateBody.put("package_id", param.packageId);
try { try {
const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.post(orderCalculateUrl, orderCalculateBody); const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.post(orderCalculateUrl, orderCalculateBody);
const result: Record<string, any> = jsonObject.getRecord<string, any>("data"); const result: Record<string, any> = jsonObject.getRecord<string, any>("data");
@@ -476,7 +476,7 @@ export class NuiSmsServiceImplService {
async createOrder(username: string, param: OrderCalculateParam): Promise<any> { async createOrder(username: string, param: OrderCalculateParam): Promise<any> {
const orderCreateUrl: string = String.format(ORDER_CREATE_URL, username); const orderCreateUrl: string = String.format(ORDER_CREATE_URL, username);
const orderCreateBody: Record<String, Object> = {}; const orderCreateBody: Record<String, Object> = {};
orderCreateBody.put("package_id", param.getPackageId()); orderCreateBody.put("package_id", param.packageId);
try { try {
const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.post(orderCreateUrl, orderCreateBody); const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.post(orderCreateUrl, orderCreateBody);
const result: Record<string, any> = jsonObject.getRecord<string, any>("data"); const result: Record<string, any> = jsonObject.getRecord<string, any>("data");
@@ -496,8 +496,8 @@ export class NuiSmsServiceImplService {
const request: HttpServletRequest = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest(); const request: HttpServletRequest = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
const protocol: string = request.isSecure() ? "https" : "http"; const protocol: string = request.isSecure() ? "https" : "http";
const host: string = request.getServerName(); const host: string = request.serverName;
const port: number = request.getServerPort(); const port: number = request.serverPort;
if (port != 80 && port != 443) { if (port != 80 && port != 443) {
host += ":" + port; host += ":" + port;
} }
@@ -557,7 +557,7 @@ export class NuiSmsServiceImplService {
* templateCreate * templateCreate
*/ */
async templateCreate(username: string, smsType: string, param: TemplateCreateParam): Promise<any> { async templateCreate(username: string, smsType: string, param: TemplateCreateParam): Promise<any> {
const templateKey: string = param.getTemplateKey(); const templateKey: string = param.templateKey;
const templateList: TemplateListVo[] = getTemplateList(smsType, username); const templateList: TemplateListVo[] = getTemplateList(smsType, username);
// 查找模版信息，如果不存在则抛出异常 // 查找模版信息，如果不存在则抛出异常
@@ -567,7 +567,7 @@ export class NuiSmsServiceImplService {
.orElseThrow(() => new AdminException("当前模版未配置短信内容")); .orElseThrow(() => new AdminException("当前模版未配置短信内容"));
// 检查模版是否配置了短信内容，如果未配置则抛出异常 // 检查模版是否配置了短信内容，如果未配置则抛出异常
if (CommonUtils.isEmpty(templateInfo.getSms()) || CommonUtils.isEmpty(templateInfo.getSms().get("content"))) { if (CommonUtils.isEmpty(templateInfo.sms) || CommonUtils.isEmpty(templateInfo.sms.get("content"))) {
throw new AdminException("当前模版未配置短信内容"); throw new AdminException("当前模版未配置短信内容");
} }
@@ -575,7 +575,7 @@ export class NuiSmsServiceImplService {
const modelInfo: NiuSmsTemplate[] = this.niuSmsTemplateRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) const modelInfo: NiuSmsTemplate[] = this.niuSmsTemplateRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })
.eq("site_id", this.requestContext.siteId) .eq("site_id", this.requestContext.siteId)
.eq("username", username)); .eq("username", username));
if (!CollectionUtils.isEmpty(modelInfo) && TemplateAuditStatus.TEMPLATE_PASS.getCode().toString() === modelInfo.get(0.getAuditStatus())) { if (!CollectionUtils.isEmpty(modelInfo) && TemplateAuditStatus.TEMPLATE_PASS.code.toString() === modelInfo.get(0.auditStatus)) {
throw new AdminException("审核通过的模版不允许修改"); throw new AdminException("审核通过的模版不允许修改");
} }
@@ -583,12 +583,12 @@ export class NuiSmsServiceImplService {
const templateCreateUrl: string = String.format(TEMPLATE_ADD_URL, username); const templateCreateUrl: string = String.format(TEMPLATE_ADD_URL, username);
const templateCreateBody: Record<String, Object> = {}; const templateCreateBody: Record<String, Object> = {};
templateCreateBody.put("temName", path.basename(templateInfo)); templateCreateBody.put("temName", path.basename(templateInfo));
templateCreateBody.put("temType", param.getTemplateType()); templateCreateBody.put("temType", param.templateType);
templateCreateBody.put("temContent", templateInfo.getSms().get("content")); templateCreateBody.put("temContent", templateInfo.sms.get("content"));
templateCreateBody.put("paramJson", param.getParamsJson()); templateCreateBody.put("paramJson", param.paramsJson);
templateCreateBody.put("extend", Map.of("template_key", templateKey)); templateCreateBody.put("extend", Map.of("template_key", templateKey));
templateCreateBody.put("signature", config.getStr("signature")); templateCreateBody.put("signature", config.getStr("signature"));
templateCreateBody.put("temId", param.getTemplateId()); templateCreateBody.put("temId", param.templateId);
Record<string, any> result; Record<string, any> result;
try { try {
@@ -606,20 +606,20 @@ export class NuiSmsServiceImplService {
if (CollectionUtils.isEmpty(modelInfo)) { if (CollectionUtils.isEmpty(modelInfo)) {
const niuSmsTemplate: NiuSmsTemplate = new NiuSmsTemplate(); const niuSmsTemplate: NiuSmsTemplate = new NiuSmsTemplate();
niuSmsTemplate.siteId = this.requestContext.siteId; niuSmsTemplate.siteId = this.requestContext.siteId;
niuSmsTemplate.setSmsType(smsType); niuSmsTemplate.smsType = smsType;
niuSmsTemplate.setUsername(username); niuSmsTemplate.username = username;
niuSmsTemplate.setTemplateKey(templateKey); niuSmsTemplate.templateKey = templateKey;
niuSmsTemplate.setAuditStatus(TemplateAuditStatus.TEMPLATE_WAIT.getCode().toString()); niuSmsTemplate.auditStatus = TemplateAuditStatus.TEMPLATE_WAIT.code.toString();
niuSmsTemplate.setTemplateId(temId.toString()); niuSmsTemplate.templateId = temId.toString();
niuSmsTemplate.setReportInfo(JSONUtil.toJsonStr(result)); niuSmsTemplate.reportInfo = JSONUtil.toJsonStr(result);
niuSmsTemplate.createTime = Date.now( / 1000); niuSmsTemplate.createTime = Date.now( / 1000);
niuSmsTemplate.updateTime = Date.now( / 1000); niuSmsTemplate.updateTime = Date.now( / 1000);
this.niuSmsTemplateRepository.save(niuSmsTemplate); this.niuSmsTemplateRepository.save(niuSmsTemplate);
} else { } else {
const niuSmsTemplate: NiuSmsTemplate = modelInfo.get(0); const niuSmsTemplate: NiuSmsTemplate = modelInfo.get(0);
niuSmsTemplate.setAuditStatus(TemplateAuditStatus.TEMPLATE_WAIT.getCode().toString()); niuSmsTemplate.auditStatus = TemplateAuditStatus.TEMPLATE_WAIT.code.toString();
niuSmsTemplate.setTemplateId(temId.toString()); niuSmsTemplate.templateId = temId.toString();
niuSmsTemplate.setReportInfo(JSONUtil.toJsonStr(result)); niuSmsTemplate.reportInfo = JSONUtil.toJsonStr(result);
niuSmsTemplate.updateTime = Date.now( / 1000); niuSmsTemplate.updateTime = Date.now( / 1000);
niuSmsTemplateMapper.updateById(niuSmsTemplate); niuSmsTemplateMapper.updateById(niuSmsTemplate);
} }
@@ -661,15 +661,15 @@ export class NuiSmsServiceImplService {
} }
const orderCreateUrl: string = String.format(TEMPLATE_INFO_URL, username); const orderCreateUrl: string = String.format(TEMPLATE_INFO_URL, username);
const templateInfoParam: Record<String, Object> = {}; const templateInfoParam: Record<String, Object> = {};
templateInfoParam.put("tem_id", niuSmsTemplate.getTemplateId()); templateInfoParam.put("tem_id", niuSmsTemplate.templateId);
try { try {
const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.get(orderCreateUrl, templateInfoParam); const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.get(orderCreateUrl, templateInfoParam);
const result: Record<string, any> = jsonObject.getRecord<string, any>("data"); const result: Record<string, any> = jsonObject.getRecord<string, any>("data");
//删除null值 防止序列化报错 //删除null值 防止序列化报错
JacksonUtils.removeNull(result); JacksonUtils.removeNull(result);
const auditStatus: string = result.containsKey("auditResult") && CommonUtils.isNotEmpty(result.getRecord<string, any>("auditResult")) const auditStatus: string = result.containsKey("auditResult") && CommonUtils.isNotEmpty(result.getRecord<string, any>("auditResult"))
? result.getStr("auditResult") : niuSmsTemplate.getAuditStatus(); ? result.getStr("auditResult") : niuSmsTemplate.auditStatus;
niuSmsTemplate.setAuditStatus(auditStatus); niuSmsTemplate.auditStatus = auditStatus;
niuSmsTemplateMapper.updateById(niuSmsTemplate); niuSmsTemplateMapper.updateById(niuSmsTemplate);
return niuSmsTemplate; return niuSmsTemplate;
} catch (e) { } catch (e) {
@@ -699,13 +699,13 @@ export class NuiSmsServiceImplService {
*/ */
async setConfig(param: RegisterAccountParam): Promise<any> { async setConfig(param: RegisterAccountParam): Promise<any> {
const config: Record<string, any> = getConfig(true); const config: Record<string, any> = getConfig(true);
config.put("default", CommonUtils.isNotEmpty(param.getDefaultVal()) ? param.getDefaultVal() : config.getOrDefault("default", "")); config.put("default", CommonUtils.isNotEmpty(param.defaultVal) ? param.defaultVal : config.getOrDefault("default", ""));
const niuSmsConfig: Record<string, any> = config.getRecord<string, any>(NIUYUN); const niuSmsConfig: Record<string, any> = config.getRecord<string, any>(NIUYUN);
const newNiuSmsConfig: Record<String, Object> = {}; const newNiuSmsConfig: Record<String, Object> = {};
newNiuSmsConfig.put("username", CommonUtils.isNotEmpty(param.getUsername()) ? param.getUsername() : niuSmsConfig != null ? niuSmsConfig.getOrDefault("username", "") : ""); newNiuSmsConfig.put("username", CommonUtils.isNotEmpty(param.username) ? param.username : niuSmsConfig != null ? niuSmsConfig.getOrDefault("username", "") : "");
newNiuSmsConfig.put("password", CommonUtils.isNotEmpty(param.getPassword()) ? param.getPassword() : niuSmsConfig != null ? niuSmsConfig.getOrDefault("password", "") : ""); newNiuSmsConfig.put("password", CommonUtils.isNotEmpty(param.password) ? param.password : niuSmsConfig != null ? niuSmsConfig.getOrDefault("password", "") : "");
newNiuSmsConfig.put("signature", CommonUtils.isNotEmpty(param.getSignature()) ? param.getSignature() : niuSmsConfig != null ? niuSmsConfig.getOrDefault("signature", "") : ""); newNiuSmsConfig.put("signature", CommonUtils.isNotEmpty(param.signature) ? param.signature : niuSmsConfig != null ? niuSmsConfig.getOrDefault("signature", "") : "");
config.put(NIUYUN, newNiuSmsConfig); config.put(NIUYUN, newNiuSmsConfig);
this.coreConfigService.setConfig(this.requestContext.siteId, "SMS", config); this.coreConfigService.config = this.requestContext.siteId, "SMS", config;
} }
} }

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

@@ -41,17 +41,17 @@ export class PayChannelServiceImplService {
const value: string = data.getRecord<string, any>("config").getStr(key, ""); const value: string = data.getRecord<string, any>("config").getStr(key, "");
if (!value.includes("*")) config.set(key, value); if (!value.includes("*")) config.set(key, value);
} }
payChannel.setConfig(config.toString()); payChannel.config = config.toString();
payChannel.setSort(data.getInt("sort")); payChannel.sort = data.getInt("sort");
payChannel.status = data.getInt("status"); payChannel.status = data.getInt("status");
payChannelMapper.updateById(payChannel); payChannelMapper.updateById(payChannel);
} else { } else {
const model: PayChannel = new PayChannel(); const model: PayChannel = new PayChannel();
model.siteId = this.requestContext.siteId; model.siteId = this.requestContext.siteId;
model.setChannel(channel); model.channel = channel;
model.type = type; model.type = type;
model.setConfig(data.getRecord<string, any>("config").toString()); model.config = data.getRecord<string, any>("config".toString());
model.setSort(data.getInt("sort")); model.sort = data.getInt("sort");
model.status = data.getInt("status"); model.status = data.getInt("status");
this.payChannelRepository.save(model); this.payChannelRepository.save(model);
} }
@@ -90,7 +90,7 @@ export class PayChannelServiceImplService {
} }
} }
} }
vo.setConfig(config.toString()); vo.config = config.toString();
} }
list.push(vo); list.push(vo);
} }

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

@@ -22,7 +22,7 @@ export class PayRefundServiceImplService {
any /* TODO: QueryWrapper<PayRefund> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<PayRefund> */ queryWrapper = new QueryWrapper();
queryWrapper.eq("site_id", this.requestContext.siteId); queryWrapper.eq("site_id", this.requestContext.siteId);
if (CommonUtils.isNotEmpty(searchParam.getRefundNo())) queryWrapper.eq("refund_no", searchParam.getRefundNo()); if (CommonUtils.isNotEmpty(searchParam.refundNo)) queryWrapper.eq("refund_no", searchParam.refundNo);
if (CommonUtils.isNotEmpty(searchParam.status)) queryWrapper.eq("status", searchParam.status); if (CommonUtils.isNotEmpty(searchParam.status)) queryWrapper.eq("status", searchParam.status);
if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper, "create_time", searchParam.createTime); if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper, "create_time", searchParam.createTime);
queryWrapper.orderByDesc("id"); queryWrapper.orderByDesc("id");
@@ -34,7 +34,7 @@ export class PayRefundServiceImplService {
for (const item of iPageRecords) { for (const item of iPageRecords) {
const vo: PayRefundListVo = new PayRefundListVo(); const vo: PayRefundListVo = new PayRefundListVo();
Object.assign(vo, item); Object.assign(vo, item);
vo.setTypeName(payTypeEnum.getByPath(vo.type + ".name", String.class)); vo.typeName = payTypeEnum.getByPath(vo.type + ".name", String.class);
list.push(vo); list.push(vo);
} }
return PageResult.build(page, limit, iPageTotal).setData(list); return PageResult.build(page, limit, iPageTotal).setData(list);

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

@@ -54,24 +54,24 @@ export class PayServiceImplService {
async add(addParam: PayParam): Promise<any> { async add(addParam: PayParam): Promise<any> {
const model: Pay = new Pay(); const model: Pay = new Pay();
model.siteId = addParam.siteId; model.siteId = addParam.siteId;
model.setMainId(addParam.getMainId()); model.mainId = addParam.mainId;
model.setOutTradeNo(addParam.getOutTradeNo()); model.outTradeNo = addParam.outTradeNo;
model.setTradeType(addParam.getTradeType()); model.tradeType = addParam.tradeType;
model.setTradeId(addParam.getTradeId()); model.tradeId = addParam.tradeId;
model.setTradeNo(addParam.getTradeNo()); model.tradeNo = addParam.tradeNo;
model.setBody(addParam.getBody()); model.body = addParam.body;
model.setMoney(addParam.getMoney()); model.money = addParam.money;
model.setVoucher(addParam.getVoucher()); model.voucher = addParam.voucher;
model.status = addParam.status; model.status = addParam.status;
model.setJson(addParam.getJson()); model.json = addParam.json;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
model.setPayTime(addParam.getPayTime()); model.payTime = addParam.payTime;
model.setCancelTime(addParam.getCancelTime()); model.cancelTime = addParam.cancelTime;
model.type = addParam.type; model.type = addParam.type;
model.setMchId(addParam.getMchId()); model.mchId = addParam.mchId;
model.setMainType(addParam.getMainType()); model.mainType = addParam.mainType;
model.setChannel(addParam.getChannel()); model.channel = addParam.channel;
model.setFailReason(addParam.getFailReason()); model.failReason = addParam.failReason;
this.payRepository.save(model); this.payRepository.save(model);
} }
@@ -85,23 +85,23 @@ export class PayServiceImplService {
if (!model) throw new BadRequestException("数据不存在!"); if (!model) throw new BadRequestException("数据不存在!");
model.id = id; model.id = id;
model.siteId = editParam.siteId; model.siteId = editParam.siteId;
model.setMainId(editParam.getMainId()); model.mainId = editParam.mainId;
model.setOutTradeNo(editParam.getOutTradeNo()); model.outTradeNo = editParam.outTradeNo;
model.setTradeType(editParam.getTradeType()); model.tradeType = editParam.tradeType;
model.setTradeId(editParam.getTradeId()); model.tradeId = editParam.tradeId;
model.setTradeNo(editParam.getTradeNo()); model.tradeNo = editParam.tradeNo;
model.setBody(editParam.getBody()); model.body = editParam.body;
model.setMoney(editParam.getMoney()); model.money = editParam.money;
model.setVoucher(editParam.getVoucher()); model.voucher = editParam.voucher;
model.status = editParam.status; model.status = editParam.status;
model.setJson(editParam.getJson()); model.json = editParam.json;
model.setPayTime(editParam.getPayTime()); model.payTime = editParam.payTime;
model.setCancelTime(editParam.getCancelTime()); model.cancelTime = editParam.cancelTime;
model.type = editParam.type; model.type = editParam.type;
model.setMchId(editParam.getMchId()); model.mchId = editParam.mchId;
model.setMainType(editParam.getMainType()); model.mainType = editParam.mainType;
model.setChannel(editParam.getChannel()); model.channel = editParam.channel;
model.setFailReason(editParam.getFailReason()); model.failReason = editParam.failReason;
payMapper.updateById(model); payMapper.updateById(model);
} }
@@ -121,22 +121,22 @@ export class PayServiceImplService {
* getFriendspayInfoByTrade * getFriendspayInfoByTrade
*/ */
async getFriendspayInfoByTrade(param: GetFriendspayInfoByTradeParam): Promise<any> { async getFriendspayInfoByTrade(param: GetFriendspayInfoByTradeParam): Promise<any> {
const payInfo: GetInfoByTradeVo = this.corePayService.getInfoByTrade(this.requestContext.siteId, param.getTradeType(), param.getTradeId(), param.getChannel(), "friendspay"); const payInfo: GetInfoByTradeVo = this.corePayService.getInfoByTrade(this.requestContext.siteId, param.tradeType, param.tradeId, param.channel, "friendspay");
if (CommonUtils.isEmpty(payInfo)) { if (CommonUtils.isEmpty(payInfo)) {
return new FriendsPayInfoByTradeVo(); return new FriendsPayInfoByTradeVo();
} }
const vo: FriendsPayInfoByTradeVo = new FriendsPayInfoByTradeVo(); const vo: FriendsPayInfoByTradeVo = new FriendsPayInfoByTradeVo();
Object.assign(vo, payInfo); Object.assign(vo, payInfo);
vo.setConfig(payInfo.config); vo.config = payInfo.config;
vo.createTime = DateUtils.timestampToString(payInfo.createTime); vo.createTime = DateUtils.timestampToString(payInfo.createTime);
if (payInfo.getCancelTime() > 0) { if (payInfo.cancelTime > 0) {
vo.setCancelTime(DateUtils.timestampToString(payInfo.getCancelTime())); vo.cancelTime = DateUtils.timestampToString(payInfo.cancelTime);
} }
if (payInfo.getPayTime() > 0) { if (payInfo.payTime > 0) {
vo.setPayTime(DateUtils.timestampToString(payInfo.getPayTime())); vo.payTime = DateUtils.timestampToString(payInfo.payTime);
} }
any /* TODO: QueryWrapper<SysPoster> */ posterQueryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<SysPoster> */ posterQueryWrapper = new QueryWrapper();
@@ -147,18 +147,18 @@ export class PayServiceImplService {
const poster: SysPoster = this.sysPosterRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }); const poster: SysPoster = this.sysPosterRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
if (CommonUtils.isNotEmpty(poster)) { if (CommonUtils.isNotEmpty(poster)) {
vo.setPosterId(poster.id); vo.posterId = poster.id;
} }
any /* TODO: QueryWrapper<Member> */ memberQueryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<Member> */ memberQueryWrapper = new QueryWrapper();
memberQueryWrapper.eq("site_id", this.requestContext.siteId) memberQueryWrapper.eq("site_id", this.requestContext.siteId)
.eq("member_id", vo.getMainId()); .eq("member_id", vo.mainId);
const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }); const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
vo.setMember(member); vo.member = member;
const qrcode: QR = getQrcode(param.getTradeType(), param.getTradeId(), param.getChannel()); const qrcode: QR = getQrcode(param.tradeType, param.tradeId, param.channel);
vo.setLink(qrcode.link); vo.link = qrcode.link;
vo.setQrcode(qrcode.qrcode); vo.qrcode = qrcode.qrcode;
return vo; return vo;
} }

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

@@ -18,19 +18,19 @@ export class PayTransferServiceImplService {
async setSceneId(param: SetSceneIdParam): Promise<any> { async setSceneId(param: SetSceneIdParam): Promise<any> {
const config: Record<string, any> = this.coreTransferSceneService.getWechatTransferSceneConfig(this.requestContext.siteId); const config: Record<string, any> = this.coreTransferSceneService.getWechatTransferSceneConfig(this.requestContext.siteId);
const tradeScenelist: Record<String, TransferSceneEnum> = TransferSceneEnum.getWechatTransferSceneMap(); const tradeScenelist: Record<String, TransferSceneEnum> = TransferSceneEnum.wechatTransferSceneMap;
if (!tradeScenelist.containsKey(param.getScene())) { if (!tradeScenelist.containsKey(param.scene)) {
throw new BadRequestException("不存在的商户转账场景"); throw new BadRequestException("不存在的商户转账场景");
} }
config.put(param.getScene(), param.getSceneId()); config.put(param.scene, param.sceneId);
this.coreTransferSceneService.setWechatTransferSceneConfig(this.requestContext.siteId, config); this.coreTransferSceneService.wechatTransferSceneConfig = this.requestContext.siteId, config;
} }
/** /**
* setTradeScene * setTradeScene
*/ */
async setTradeScene(param: SetTradeSceneParam): Promise<any> { async setTradeScene(param: SetTradeSceneParam): Promise<any> {
this.coreTransferSceneService.setTradeScene(this.requestContext.siteId, param.type, param); this.coreTransferSceneService.tradeScene = this.requestContext.siteId, param.type, param;
} }
} }

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

@@ -22,8 +22,8 @@ export class SiteAccountLogServiceImplService {
any /* TODO: QueryWrapper<SiteAccountLog> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<SiteAccountLog> */ queryWrapper = new QueryWrapper();
queryWrapper.eq("site_id", this.requestContext.siteId); queryWrapper.eq("site_id", this.requestContext.siteId);
//查询条件判断组装 //查询条件判断组装
if (CommonUtils.isNotEmpty(searchParam.getTradeNo())) { if (CommonUtils.isNotEmpty(searchParam.tradeNo)) {
queryWrapper.like("trade_no", searchParam.getTradeNo()); queryWrapper.like("trade_no", searchParam.tradeNo);
} }
if (CommonUtils.isNotEmpty(searchParam.type)) { if (CommonUtils.isNotEmpty(searchParam.type)) {
queryWrapper.eq("type", searchParam.type); queryWrapper.eq("type", searchParam.type);
@@ -49,7 +49,7 @@ export class SiteAccountLogServiceImplService {
typeModel = this.payTransferRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })) typeModel = this.payTransferRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }))
.last("limit 1")); .last("limit 1"));
} }
vo.setPayInfo(typeModel); vo.payInfo = typeModel;
list.push(vo); list.push(vo);
} }
@@ -79,7 +79,7 @@ export class SiteAccountLogServiceImplService {
typeModel = this.payTransferRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })) typeModel = this.payTransferRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }))
.last("limit 1")); .last("limit 1"));
} }
vo.setPayInfo(typeModel); vo.payInfo = typeModel;
return vo; return vo;
} }
} }

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

@@ -24,8 +24,8 @@ export class SiteGroupServiceImplService {
const limit: number = pageParam.limit; const limit: number = pageParam.limit;
any /* TODO: QueryWrapper<SiteGroup> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<SiteGroup> */ queryWrapper = new QueryWrapper();
if (CommonUtils.isNotEmpty(searchParam.getKeywords())) { if (CommonUtils.isNotEmpty(searchParam.keywords)) {
queryWrapper.like("group_name", searchParam.getKeywords()); queryWrapper.like("group_name", searchParam.keywords);
} }
queryWrapper.orderByDesc("group_id"); queryWrapper.orderByDesc("group_id");
@@ -36,15 +36,15 @@ export class SiteGroupServiceImplService {
const list: SiteGroupListVo[] = []; const list: SiteGroupListVo[] = [];
for (const item of iPageRecords) { for (const item of iPageRecords) {
const vo: SiteGroupListVo = new SiteGroupListVo(); const vo: SiteGroupListVo = new SiteGroupListVo();
vo.setGroupId(item.getGroupId()); vo.groupId = item.groupId;
vo.setGroupName(item.getGroupName()); vo.groupName = item.groupName;
vo.setGroupDesc(item.getGroupDesc()); vo.groupDesc = item.groupDesc;
vo.createTime = item.createTime; vo.createTime = item.createTime;
vo.updateTime = item.updateTime; vo.updateTime = item.updateTime;
const addonJson: JSONArray = JSONUtil.parseArray(item.getAddon()); const addonJson: JSONArray = JSONUtil.parseArray(item.addon);
vo.setAddon(addonJson); vo.addon = addonJson;
const appJson: JSONArray = JSONUtil.parseArray(item.getApp()); const appJson: JSONArray = JSONUtil.parseArray(item.app);
vo.setApp(appJson); vo.app = appJson;
const addonStr: string[] = []; const addonStr: string[] = [];
const appStr: string[] = []; const appStr: string[] = [];
const appList: SiteGroupListVo.IconAndTitle[] = []; const appList: SiteGroupListVo.IconAndTitle[] = [];
@@ -75,13 +75,13 @@ export class SiteGroupServiceImplService {
appList.push(iconAndTitle); appList.push(iconAndTitle);
} }
} }
vo.setAddonName(addonStr); vo.addonName = addonStr;
vo.setAppName(appStr); vo.appName = appStr;
vo.setAddonList(addonListResult); vo.addonList = addonListResult;
vo.setAppList(appList); vo.appList = appList;
list.push(vo); list.push(vo);
} }
return PageResult.build(iPage.getCurrent(), iPage.getSize(), iPageTotal).setData(list); return PageResult.build(iPage.current, iPage.size, iPageTotal).setData(list);
} }
/** /**
@@ -109,15 +109,15 @@ export class SiteGroupServiceImplService {
*/ */
async add(addParam: SiteGroupAddParam): Promise<any> { async add(addParam: SiteGroupAddParam): Promise<any> {
const groupRoles: JSONArray = new JSONArray(); const groupRoles: JSONArray = new JSONArray();
groupRoles.addAll(addParam.getAddon()); groupRoles.addAll(addParam.addon);
groupRoles.addAll(addParam.getApp()); groupRoles.addAll(addParam.app);
/**判断应用是否全部是有效的已安装应用 */ /**判断应用是否全部是有效的已安装应用 */
checkAddon(groupRoles); checkAddon(groupRoles);
const model: SiteGroup = new SiteGroup(); const model: SiteGroup = new SiteGroup();
model.setGroupName(addParam.getGroupName()); model.groupName = addParam.groupName;
model.setGroupDesc(addParam.getGroupDesc()); model.groupDesc = addParam.groupDesc;
model.setApp(JSONUtil.toJsonStr(addParam.getApp())); model.app = JSONUtil.toJsonStr(addParam.app);
model.setAddon(JSONUtil.toJsonStr(addParam.getAddon())); model.addon = JSONUtil.toJsonStr(addParam.addon);
model.createTime = DateUtils.currTime(); model.createTime = DateUtils.currTime();
model.updateTime = DateUtils.currTime(); model.updateTime = DateUtils.currTime();
this.siteGroupRepository.save(model); this.siteGroupRepository.save(model);
@@ -133,29 +133,29 @@ export class SiteGroupServiceImplService {
if (!model) throw new BadRequestException("数据不存在!"); if (!model) throw new BadRequestException("数据不存在!");
const groupRoles: JSONArray = new JSONArray(); const groupRoles: JSONArray = new JSONArray();
groupRoles.addAll(editParam.getAddon()); groupRoles.addAll(editParam.addon);
groupRoles.addAll(editParam.getApp()); groupRoles.addAll(editParam.app);
/**判断应用是否全部是有效的已安装应用 */ /**判断应用是否全部是有效的已安装应用 */
checkAddon(groupRoles); checkAddon(groupRoles);
const group: SiteGroup = new SiteGroup(); const group: SiteGroup = new SiteGroup();
group.setGroupId(id); group.groupId = id;
group.setGroupId(editParam.getGroupId()); group.groupId = editParam.groupId;
group.setGroupName(editParam.getGroupName()); group.groupName = editParam.groupName;
group.setGroupDesc(editParam.getGroupDesc()); group.groupDesc = editParam.groupDesc;
group.setApp(JSONUtil.toJsonStr(editParam.getApp())); group.app = JSONUtil.toJsonStr(editParam.app);
group.setAddon(JSONUtil.toJsonStr(editParam.getAddon())); group.addon = JSONUtil.toJsonStr(editParam.addon);
group.updateTime = DateUtils.currTime(); group.updateTime = DateUtils.currTime();
siteGroupMapper.updateById(group); siteGroupMapper.updateById(group);
this.cached.remove("site_group_menu_ids" + id); this.cached.remove("site_group_menu_ids" + id);
if (!model.getApp() === group.getApp()) { if (!model.app === group.app) {
// 修改站点应用 // 修改站点应用
const siteModel: Site = new Site(); const siteModel: Site = new Site();
siteModel.setApp(model.getApp()); siteModel.app = model.app;
this.siteRepository.save(siteModel, /* TODO: any /* TODO: QueryWrapper<Site> */需改写为TypeORM的where条件对象 */.eq("group_id", id)); this.siteRepository.save(siteModel, /* TODO: any /* TODO: QueryWrapper<Site> */需改写为TypeORM的where条件对象 */.eq("group_id", id));
} }
if (!model.getApp() === group.getApp() || !model.getAddon() === group.getAddon()) { if (!model.app === group.app || !model.addon === group.addon) {
const siteList: Site[] = this.siteRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })); const siteList: Site[] = this.siteRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }));
if (CommonUtils.isNotEmpty(siteList)) { if (CommonUtils.isNotEmpty(siteList)) {
for (const site of siteList) { for (const site of siteList) {
@@ -186,7 +186,7 @@ export class SiteGroupServiceImplService {
* checkAddon * checkAddon
*/ */
async checkAddon(jsonArray: JSONArray): Promise<any> { async checkAddon(jsonArray: JSONArray): Promise<any> {
const addonListVoMap: Record<String, InstallAddonListVo> = this.coreAddonService.getInstallAddonList(); const addonListVoMap: Record<String, InstallAddonListVo> = this.coreAddonService.installAddonList;
const keys: string[] = new ArrayList<>(addonListVoMap.keySet()); const keys: string[] = new ArrayList<>(addonListVoMap.keySet());
const addonString: string[] = JSONUtil.toList(jsonArray, String.class); const addonString: string[] = JSONUtil.toList(jsonArray, String.class);
keys.retainAll(addonString); keys.retainAll(addonString);
@@ -205,7 +205,7 @@ export class SiteGroupServiceImplService {
for (const siteGroup of siteGroupList) { for (const siteGroup of siteGroupList) {
const siteGroupListVo: SiteGroupListVo = new SiteGroupListVo(); const siteGroupListVo: SiteGroupListVo = new SiteGroupListVo();
Object.assign(siteGroupListVo, siteGroup); Object.assign(siteGroupListVo, siteGroup);
siteGroupListVo.setSiteNum(getUserSiteGroupSiteNum(uid, siteGroup.getGroupId())); siteGroupListVo.siteNum = getUserSiteGroupSiteNum(uid, siteGroup.groupId);
siteGroupListVoList.push(siteGroupListVo); siteGroupListVoList.push(siteGroupListVo);
} }
return siteGroupListVoList; return siteGroupListVoList;
@@ -216,7 +216,7 @@ export class SiteGroupServiceImplService {
*/ */
async getUserSiteGroupSiteNum(uid: number, groupId: number): Promise<any> { async getUserSiteGroupSiteNum(uid: number, groupId: number): Promise<any> {
MPJany /* TODO: QueryWrapper<SysUserRole> */ userRoleMPJQueryWrapper = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<SysUserRole> */ userRoleMPJQueryWrapper = new MPJQueryWrapper();
userRoleMPJQueryWrapper.setAlias("sur") userRoleMPJQueryWrapper.alias = "sur"
.leftJoin("?_site s ON sur.site_id = s.site_id".replace("?_", this.appConfig.tablePrefix)); .leftJoin("?_site s ON sur.site_id = s.site_id".replace("?_", this.appConfig.tablePrefix));
userRoleMPJQueryWrapper.eq("sur.uid", uid); userRoleMPJQueryWrapper.eq("sur.uid", uid);
userRoleMPJQueryWrapper.eq("sur.is_admin", 1); userRoleMPJQueryWrapper.eq("sur.is_admin", 1);

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

@@ -27,22 +27,22 @@ export class SiteServiceImplService {
const limit: number = pageParam.limit; const limit: number = pageParam.limit;
MPJany /* TODO: QueryWrapper<Site> */ queryWrapper = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<Site> */ queryWrapper = new MPJQueryWrapper();
queryWrapper.setAlias("se") queryWrapper.alias = "se"
.selectAll(Site.class) .selectAll(Site.class)
.select("sg.group_name") .select("sg.group_name")
.leftJoin("?_site_group sg on sg.group_id = se.group_id".replace("?_", this.appConfig.tablePrefix)); .leftJoin("?_site_group sg on sg.group_id = se.group_id".replace("?_", this.appConfig.tablePrefix));
//查询条件判断组装 //查询条件判断组装
if (CommonUtils.isNotEmpty(searchParam.getKeywords())) { if (CommonUtils.isNotEmpty(searchParam.keywords)) {
queryWrapper.like("se.siteName", searchParam.getKeywords()).or().like("se.siteName", searchParam.getKeywords()); queryWrapper.like("se.siteName", searchParam.keywords).or().like("se.siteName", searchParam.keywords);
} }
if (CommonUtils.isNotEmpty(searchParam.getApp())) { if (CommonUtils.isNotEmpty(searchParam.app)) {
queryWrapper.and(wrapper => wrapper queryWrapper.and(wrapper => wrapper
.like("sg.addon", searchParam.getApp()) .like("sg.addon", searchParam.app)
.or() .or()
.like("sg.app", searchParam.getApp()) .like("sg.app", searchParam.app)
); );
} }
@@ -50,12 +50,12 @@ export class SiteServiceImplService {
queryWrapper.eq("se.status", searchParam.status); queryWrapper.eq("se.status", searchParam.status);
} }
if (CommonUtils.isNotEmpty(searchParam.getGroupId())) { if (CommonUtils.isNotEmpty(searchParam.groupId)) {
queryWrapper.eq("se.group_id", searchParam.getGroupId()); queryWrapper.eq("se.group_id", searchParam.groupId);
} }
if (CommonUtils.isNotEmpty(searchParam.getSiteDomain())) { if (CommonUtils.isNotEmpty(searchParam.siteDomain)) {
queryWrapper.like("se.site_domain", searchParam.getSiteDomain()); queryWrapper.like("se.site_domain", searchParam.siteDomain);
} }
queryWrapper.ne("se.app_type", "admin"); queryWrapper.ne("se.app_type", "admin");
if (CommonUtils.isNotEmpty(searchParam.createTime)) { if (CommonUtils.isNotEmpty(searchParam.createTime)) {
@@ -72,9 +72,9 @@ export class SiteServiceImplService {
} }
} }
if (CommonUtils.isNotEmpty(searchParam.getExpireTime())) { if (CommonUtils.isNotEmpty(searchParam.expireTime)) {
const expireTime: string[] = searchParam.getExpireTime(); const expireTime: string[] = searchParam.expireTime;
const startTime: number = (expireTime[0] == null) ? 0 : DateUtils.StringToTimestamp(expireTime[0]); const startTime: number = (expireTime[0] == null) ? 0 : DateUtils.StringToTimestamp(expireTime[0]);
const endTime: number = (expireTime[1] == null) ? 0 : DateUtils.StringToTimestamp(expireTime[1]); const endTime: number = (expireTime[1] == null) ? 0 : DateUtils.StringToTimestamp(expireTime[1]);
if (startTime > 0 && endTime > 0) { if (startTime > 0 && endTime > 0) {
@@ -100,7 +100,7 @@ export class SiteServiceImplService {
.leftJoin("?_sys_user nsu ON nsur.uid = nsu.uid".replace("?_", this.appConfig.tablePrefix)); .leftJoin("?_sys_user nsu ON nsur.uid = nsu.uid".replace("?_", this.appConfig.tablePrefix));
userRoleMPJQueryWrapper.eq("nsur.is_admin", 1); userRoleMPJQueryWrapper.eq("nsur.is_admin", 1);
userRoleMPJQueryWrapper.eq("nsur.site_id", item.siteId); userRoleMPJQueryWrapper.eq("nsur.site_id", item.siteId);
vo.setAdmin(sysUserRoleMapper.selectJoinOne(SiteAdminVo.class, userRoleMPJQueryWrapper)); vo.admin = sysUserRoleMapper.selectJoinOne(SiteAdminVo.class, userRoleMPJQueryWrapper);
list.push(vo); list.push(vo);
} }
return PageResult.build(page, limit, iPageTotal, list); return PageResult.build(page, limit, iPageTotal, list);
@@ -117,36 +117,36 @@ export class SiteServiceImplService {
* add * add
*/ */
async add(addParam: SiteAddParam): Promise<any> { async add(addParam: SiteAddParam): Promise<any> {
const siteGroup: SiteGroup = this.siteGroupService.info(addParam.getGroupId()); const siteGroup: SiteGroup = this.siteGroupService.info(addParam.groupId);
if (ObjectUtil.isNull(siteGroup) || CommonUtils.isEmpty(siteGroup)) { if (ObjectUtil.isNull(siteGroup) || CommonUtils.isEmpty(siteGroup)) {
throw new BadRequestException("SITE_GROUP_NOT_EXIST"); throw new BadRequestException("SITE_GROUP_NOT_EXIST");
} }
const model: Site = new Site(); const model: Site = new Site();
model.setSiteName(addParam.getSiteName()); model.siteName = addParam.siteName;
model.setGroupId(addParam.getGroupId()); model.groupId = addParam.groupId;
model.setAppType(AppTypeEnum.path.basename(SITE)); model.appType = AppTypeEnum.path.basename(SITE);
model.createTime = DateUtils.currTime(); model.createTime = DateUtils.currTime();
model.setExpireTime(DateUtils.StringToTimestamp(addParam.getExpireTime())); model.expireTime = DateUtils.StringToTimestamp(addParam.expireTime);
model.setApp(siteGroup.getApp()); model.app = siteGroup.app;
model.setAddons(""); model.addons = "";
model.setSiteDomain(addParam.getSiteDomain()); model.siteDomain = addParam.siteDomain;
this.siteRepository.save(model); this.siteRepository.save(model);
const siteId: number = model.siteId; const siteId: number = model.siteId;
if (ObjectUtil.isNull(addParam.getUid()) || addParam.getUid() == 0) { if (ObjectUtil.isNull(addParam.uid) || addParam.uid == 0) {
//添加用户 //添加用户
const siteUserParam: SiteUserParam = new SiteUserParam(); const siteUserParam: SiteUserParam = new SiteUserParam();
siteUserParam.setUsername(addParam.getUsername()); siteUserParam.username = addParam.username;
siteUserParam.setHeadImg(""); siteUserParam.headImg = "";
siteUserParam.status = 1; siteUserParam.status = 1;
siteUserParam.setRealName(addParam.getRealName()); siteUserParam.realName = addParam.realName;
siteUserParam.setPassword(addParam.getPassword()); siteUserParam.password = addParam.password;
siteUserParam.setIsAdmin(1); siteUserParam.isAdmin = 1;
this.sysUserService.addSiteUser(siteUserParam, siteId); this.sysUserService.addSiteUser(siteUserParam, siteId);
} else { } else {
const sysUserRoleParam: SysUserRoleParam = new SysUserRoleParam(); const sysUserRoleParam: SysUserRoleParam = new SysUserRoleParam();
sysUserRoleParam.setUid(addParam.getUid()); sysUserRoleParam.uid = addParam.uid;
sysUserRoleParam.setRoleIds(new JsonArray().toString()); sysUserRoleParam.roleIds = new JsonArray(.toString());
sysUserRoleParam.setIsAdmin(1); sysUserRoleParam.isAdmin = 1;
sysUserRoleParam.siteId = siteId; sysUserRoleParam.siteId = siteId;
this.userRoleService.push(sysUserRoleParam); this.userRoleService.push(sysUserRoleParam);
} }
@@ -155,13 +155,13 @@ export class SiteServiceImplService {
event.siteId = siteId; event.siteId = siteId;
event.addAppSign("core"); event.addAppSign("core");
event.name = "SiteAddAfterEvent"; event.name = "SiteAddAfterEvent";
event.setSite(model); event.site = model;
event.setSiteGroup(siteGroup); event.siteGroup = siteGroup;
EventAndSubscribeOfPublisher.publishAll(event); EventAndSubscribeOfPublisher.publishAll(event);
const param: Record<String, Object> = {}; const param: Record<String, Object> = {};
param.put("site_id", siteId); param.put("site_id", siteId);
param.put("main_app", siteGroup.getApp()); param.put("main_app", siteGroup.app);
param.put("tag", "add"); param.put("tag", "add");
this.diyService.loadDiyData(param); this.diyService.loadDiyData(param);
} }
@@ -174,32 +174,32 @@ export class SiteServiceImplService {
.last("limit 1")); .last("limit 1"));
if (!model) throw new BadRequestException("数据不存在!"); if (!model) throw new BadRequestException("数据不存在!");
if (ObjectUtil.isNotNull(editParam.getGroupId()) && CommonUtils.isNotEmpty(editParam.getGroupId()) && !editParam.getGroupId() === model.getGroupId()) { if (ObjectUtil.isNotNull(editParam.groupId) && CommonUtils.isNotEmpty(editParam.groupId) && !editParam.groupId === model.groupId) {
model.setGroupId(editParam.getGroupId()); model.groupId = editParam.groupId;
} }
if (ObjectUtil.isNotNull(editParam.getSiteName()) && CommonUtils.isNotEmpty(editParam.getSiteName())) { if (ObjectUtil.isNotNull(editParam.siteName) && CommonUtils.isNotEmpty(editParam.siteName)) {
model.setSiteName(editParam.getSiteName()); model.siteName = editParam.siteName;
} }
const oldSiteGroup: SiteGroup = this.siteGroupService.info(model.getGroupId()); const oldSiteGroup: SiteGroup = this.siteGroupService.info(model.groupId);
const initallJsonArray: JSONArray = new JSONArray(); const initallJsonArray: JSONArray = new JSONArray();
if (ObjectUtil.isNull(model.getInitalledAddon()) || CommonUtils.isEmpty(model.getInitalledAddon())) { if (ObjectUtil.isNull(model.initalledAddon) || CommonUtils.isEmpty(model.initalledAddon)) {
initallJsonArray.addAll(JSONUtil.parseArray(oldSiteGroup.getApp())); initallJsonArray.addAll(JSONUtil.parseArray(oldSiteGroup.app));
initallJsonArray.addAll(JSONUtil.parseArray(oldSiteGroup.getAddon())); initallJsonArray.addAll(JSONUtil.parseArray(oldSiteGroup.addon));
} }
const siteGroup: SiteGroup = this.siteGroupService.info(editParam.getGroupId()); const siteGroup: SiteGroup = this.siteGroupService.info(editParam.groupId);
if (ObjectUtil.isNull(siteGroup) || CommonUtils.isEmpty(siteGroup)) { if (ObjectUtil.isNull(siteGroup) || CommonUtils.isEmpty(siteGroup)) {
throw new BadRequestException("SITE_GROUP_NOT_EXIST"); throw new BadRequestException("SITE_GROUP_NOT_EXIST");
} }
initallJsonArray.addAll(JSONUtil.parseArray(siteGroup.getApp())); initallJsonArray.addAll(JSONUtil.parseArray(siteGroup.app));
initallJsonArray.addAll(JSONUtil.parseArray(siteGroup.getAddon())); initallJsonArray.addAll(JSONUtil.parseArray(siteGroup.addon));
model.setInitalledAddon(JSONUtil.toJsonStr(initallJsonArray)); model.initalledAddon = JSONUtil.toJsonStr(initallJsonArray);
model.setSiteDomain(editParam.getSiteDomain()); model.siteDomain = editParam.siteDomain;
model.setExpireTime(new DateTime(editParam.getExpireTime()).getTime() / 1000); model.expireTime = new DateTime(editParam.expireTime.getTime() / 1000);
model.status = model.getExpireTime( > DateUtils.currTime() ? SiteStatusEnum.ON.getCode() : SiteStatusEnum.EXPIRE.getCode()); model.status = model.expireTime > DateUtils.currTime( ? SiteStatusEnum.ON.code : SiteStatusEnum.EXPIRE.code);
siteMapper.updateById(model); siteMapper.updateById(model);
this.coreSiteService.clearSiteCache(id); this.coreSiteService.clearSiteCache(id);
@@ -208,8 +208,8 @@ export class SiteServiceImplService {
event.siteId = model.siteId; event.siteId = model.siteId;
event.addAppSign("core"); event.addAppSign("core");
event.name = "SiteEditAfterEvent"; event.name = "SiteEditAfterEvent";
event.setSite(model); event.site = model;
event.setSiteGroup(siteGroup); event.siteGroup = siteGroup;
EventAndSubscribeOfPublisher.publishAll(event); EventAndSubscribeOfPublisher.publishAll(event);
} }
@@ -253,8 +253,8 @@ export class SiteServiceImplService {
deleteMethod.invoke(mapper, wrapper); deleteMethod.invoke(mapper, wrapper);
} catch (e) { } catch (e) {
log.error("删除表数据失败: {} | 原因: {}", log.error("删除表数据失败: {} | 原因: {}",
entityClass.getSimpleName(), entityClass.simpleName,
e.getCause() != null ? e.getCause().getMessage() : e.message); e.cause != null ? e.cause.message : e.message);
} }
} }
@@ -268,14 +268,14 @@ export class SiteServiceImplService {
this.siteRepository.delete(id); this.siteRepository.delete(id);
} catch (e) { } catch (e) {
log.error("删除站点失败: {}", e.message, e); log.error("删除站点失败: {}", e.message, e);
throw new BadRequestException("删除失败: " + (e.getCause() != null ? e.getCause().getMessage() : e.message)); throw new BadRequestException("删除失败: " + (e.cause != null ? e.cause.message : e.message));
} }
// 清理缓存 // 清理缓存
if (delResult > 0 && siteUserRoles != null) { if (delResult > 0 && siteUserRoles != null) {
siteUserRoles.forEach(userRole => { siteUserRoles.forEach(userRole => {
cached.remove("user_role_" + userRole.getUid() + "_" + id); cached.remove("user_role_" + userRole.uid + "_" + id);
cached.remove("user_role_list_" + userRole.getUid()); cached.remove("user_role_list_" + userRole.uid);
}); });
} }
cached.remove("site_cache_" + id); cached.remove("site_cache_" + id);
@@ -287,7 +287,7 @@ export class SiteServiceImplService {
async closeSite(siteId: number): Promise<any> { async closeSite(siteId: number): Promise<any> {
const model: Site = new Site(); const model: Site = new Site();
model.siteId = siteId; model.siteId = siteId;
model.status = SiteStatusEnum.CLOSE.getCode(); model.status = SiteStatusEnum.CLOSE.code;
siteMapper.updateById(model); siteMapper.updateById(model);
this.coreSiteService.clearSiteCache(siteId); this.coreSiteService.clearSiteCache(siteId);
} }
@@ -298,7 +298,7 @@ export class SiteServiceImplService {
async openSite(siteId: number): Promise<any> { async openSite(siteId: number): Promise<any> {
const model: Site = new Site(); const model: Site = new Site();
model.siteId = siteId; model.siteId = siteId;
model.status = SiteStatusEnum.ON.getCode(); model.status = SiteStatusEnum.ON.code;
siteMapper.updateById(model); siteMapper.updateById(model);
this.coreSiteService.clearSiteCache(siteId); this.coreSiteService.clearSiteCache(siteId);
} }
@@ -326,17 +326,17 @@ export class SiteServiceImplService {
queryWrapper.eq("status", siteSearchParam.status); queryWrapper.eq("status", siteSearchParam.status);
} }
if (CommonUtils.isNotEmpty(siteSearchParam.getGroupId())) { if (CommonUtils.isNotEmpty(siteSearchParam.groupId)) {
queryWrapper.eq("group_id", siteSearchParam.getGroupId()); queryWrapper.eq("group_id", siteSearchParam.groupId);
} }
if (CommonUtils.isNotEmpty(siteSearchParam.appType)) { if (CommonUtils.isNotEmpty(siteSearchParam.appType)) {
queryWrapper.eq("app_type", siteSearchParam.appType); queryWrapper.eq("app_type", siteSearchParam.appType);
} }
if (CommonUtils.isNotEmpty(siteSearchParam.getExpireTime())) { if (CommonUtils.isNotEmpty(siteSearchParam.expireTime)) {
const expireTime: string[] = siteSearchParam.getExpireTime(); const expireTime: string[] = siteSearchParam.expireTime;
const startTime: number = (expireTime[0] == null) ? 0 : DateUtils.StringToTimestamp(expireTime[0]); const startTime: number = (expireTime[0] == null) ? 0 : DateUtils.StringToTimestamp(expireTime[0]);
const endTime: number = (expireTime[1] == null) ? 0 : DateUtils.StringToTimestamp(expireTime[1]); const endTime: number = (expireTime[1] == null) ? 0 : DateUtils.StringToTimestamp(expireTime[1]);
if (startTime > 0 && endTime > 0) { if (startTime > 0 && endTime > 0) {
@@ -368,8 +368,8 @@ export class SiteServiceImplService {
event.siteId = site.siteId; event.siteId = site.siteId;
event.addAppSign("core"); event.addAppSign("core");
event.name = "SiteEditAfterEvent"; event.name = "SiteEditAfterEvent";
event.setSite(site); event.site = site;
event.setSiteGroup(siteGroup); event.siteGroup = siteGroup;
this.coreSiteService.clearSiteCache(site.siteId); this.coreSiteService.clearSiteCache(site.siteId);
EventAndSubscribeOfPublisher.publishAll(event); EventAndSubscribeOfPublisher.publishAll(event);
} }
@@ -406,7 +406,7 @@ export class SiteServiceImplService {
} }
const showList: Record<String, Object> = showCustomer(false); const showList: Record<String, Object> = showCustomer(false);
const addonChildMenus: AddonChildMenuEnum.MenuConfig[] = AddonChildMenuEnum.getAll(); const addonChildMenus: AddonChildMenuEnum.MenuConfig[] = AddonChildMenuEnum.all;
const menuList: SpecialMenuListVo.MenuVo[] = []; const menuList: SpecialMenuListVo.MenuVo[] = [];
@@ -426,19 +426,19 @@ export class SiteServiceImplService {
} }
} }
SpecialMenuListVo.const tempMenu: MenuVo = new SpecialMenuListVo.MenuVo(); SpecialMenuListVo.const tempMenu: MenuVo = new SpecialMenuListVo.MenuVo();
tempMenu.setMenuName(path.basename(item)); tempMenu.menuName = path.basename(item);
tempMenu.setMenuKey(item.key); tempMenu.menuKey = item.key;
tempMenu.setMenuShortName(item.getShortName()); tempMenu.menuShortName = item.shortName;
tempMenu.setParentKey("addon"); tempMenu.parentKey = "addon";
tempMenu.setMenuType("0"); tempMenu.menuType = "0";
tempMenu.icon = "iconfont iconzhuangxiu3"; tempMenu.icon = "iconfont iconzhuangxiu3";
tempMenu.setApiUrl(""); tempMenu.apiUrl = "";
tempMenu.setRouterPath(""); tempMenu.routerPath = "";
tempMenu.setViewPath(""); tempMenu.viewPath = "";
tempMenu.setMethods(""); tempMenu.methods = "";
tempMenu.setSort(item.getSort()); tempMenu.sort = item.sort;
tempMenu.status = "1"; tempMenu.status = "1";
tempMenu.setIsShow("1"); tempMenu.isShow = "1";
const children: SpecialMenuListVo.MenuVo[] = []; const children: SpecialMenuListVo.MenuVo[] = [];
const authChildren: JSONArray = addonMenu.getJSONArray("children"); const authChildren: JSONArray = addonMenu.getJSONArray("children");
@@ -453,12 +453,12 @@ export class SiteServiceImplService {
} }
} }
tempMenu.setChildren(children); tempMenu.children = children;
menuList.push(tempMenu); menuList.push(tempMenu);
} }
const result: SpecialMenuListVo = new SpecialMenuListVo(); const result: SpecialMenuListVo = new SpecialMenuListVo();
result.setParentKey("addon"); result.parentKey = "addon";
result.setList(menuList); result.list = menuList;
return result; return result;
} }

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

@@ -25,8 +25,8 @@ export class SiteUserServiceImplService {
userRoleMPJQueryWrapper.select("nsur.id, nsur.is_admin, nsu.status, nsur.site_id, nsur.role_ids, nsu.uid, nsu.username, nsu.head_img, nsu.real_name, nsu.last_ip, nsu.last_time, nsu.create_time, nsu.login_count") userRoleMPJQueryWrapper.select("nsur.id, nsur.is_admin, nsu.status, nsur.site_id, nsur.role_ids, nsu.uid, nsu.username, nsu.head_img, nsu.real_name, nsu.last_ip, nsu.last_time, nsu.create_time, nsu.login_count")
.setAlias("nsur") .setAlias("nsur")
.leftJoin("?_sys_user nsu ON nsur.uid = nsu.uid".replace("?_", this.appConfig.tablePrefix)); .leftJoin("?_sys_user nsu ON nsur.uid = nsu.uid".replace("?_", this.appConfig.tablePrefix));
if(ObjectUtil.isNotNull(searchParam.getUsername()) && CommonUtils.isNotEmpty(searchParam.getUsername())){ if(ObjectUtil.isNotNull(searchParam.username) && CommonUtils.isNotEmpty(searchParam.username)){
userRoleMPJQueryWrapper.like("nsu.username", searchParam.getUsername()); userRoleMPJQueryWrapper.like("nsu.username", searchParam.username);
} }
userRoleMPJQueryWrapper.eq("nsur.site_id", this.requestContext.siteId); userRoleMPJQueryWrapper.eq("nsur.site_id", this.requestContext.siteId);
userRoleMPJQueryWrapper.isNotNull("nsu.uid"); userRoleMPJQueryWrapper.isNotNull("nsu.uid");
@@ -35,15 +35,15 @@ export class SiteUserServiceImplService {
[SiteUserVo[], number] iPage = sysUserRoleMapper.selectJoinPage(new Page<>(page, limit), SiteUserVo.class, userRoleMPJQueryWrapper); [SiteUserVo[], number] iPage = sysUserRoleMapper.selectJoinPage(new Page<>(page, limit), SiteUserVo.class, userRoleMPJQueryWrapper);
for (const siteUserVo of iPageRecords) { for (const siteUserVo of iPageRecords) {
const roleArray: string[] = []; const roleArray: string[] = [];
if(CommonUtils.isNotEmpty(siteUserVo.getRoleIds()) && JSONUtil.parseArray(siteUserVo.getRoleIds()).size()>0){ if(CommonUtils.isNotEmpty(siteUserVo.roleIds) && JSONUtil.parseArray(siteUserVo.roleIds).size()>0){
any /* TODO: QueryWrapper<SysRole> */ roleQueryWrapper=new QueryWrapper(); any /* TODO: QueryWrapper<SysRole> */ roleQueryWrapper=new QueryWrapper();
roleQueryWrapper.in("role_id", JSONUtil.parseArray(siteUserVo.getRoleIds())); roleQueryWrapper.in("role_id", JSONUtil.parseArray(siteUserVo.roleIds));
const roleList: SysRole[] = this.sysRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); const roleList: SysRole[] = this.sysRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
for (const sysRole of roleList) { for (const sysRole of roleList) {
roleArray.push(sysRole.getRoleName()); roleArray.push(sysRole.roleName);
} }
} }
siteUserVo.setRoleArray(roleArray); siteUserVo.roleArray = roleArray;
} }
return PageResult.build(page, limit, iPageTotal).setData(iPageRecords); return PageResult.build(page, limit, iPageTotal).setData(iPageRecords);
} }
@@ -52,7 +52,7 @@ export class SiteUserServiceImplService {
* add * add
*/ */
async add(siteUserParam: SiteUserParam): Promise<any> { async add(siteUserParam: SiteUserParam): Promise<any> {
if (siteUserParam.getUsername().matches(".*[\\u4e00-\\u9fa5].*")){ if (siteUserParam.username.matches(".*[\\u4e00-\\u9fa5].*")){
throw new AdminException("用户名不能包含中文"); throw new AdminException("用户名不能包含中文");
} }
this.sysUserService.addSiteUser(siteUserParam, this.requestContext.siteId); this.sysUserService.addSiteUser(siteUserParam, this.requestContext.siteId);
@@ -79,20 +79,20 @@ export class SiteUserServiceImplService {
async edit(uid: number, siteUserParam: SiteUserParam): Promise<any> { async edit(uid: number, siteUserParam: SiteUserParam): Promise<any> {
try{ try{
const sysUserParam: SysUserParam = new SysUserParam(); const sysUserParam: SysUserParam = new SysUserParam();
sysUserParam.setHeadImg(siteUserParam.getHeadImg()); sysUserParam.headImg = siteUserParam.headImg;
if(CommonUtils.isNotEmpty(siteUserParam.getPassword())){ if(CommonUtils.isNotEmpty(siteUserParam.password)){
sysUserParam.setPassword(siteUserParam.getPassword()); sysUserParam.password = siteUserParam.password;
} }
sysUserParam.setUsername(siteUserParam.getUsername()); sysUserParam.username = siteUserParam.username;
sysUserParam.status = siteUserParam.status; sysUserParam.status = siteUserParam.status;
sysUserParam.setRealName(siteUserParam.getRealName()); sysUserParam.realName = siteUserParam.realName;
this.sysUserService.edit(uid, sysUserParam); this.sysUserService.edit(uid, sysUserParam);
//创建用户站点管理权限 //创建用户站点管理权限
const roleIds: string[] = siteUserParam.getRoleIds(); const roleIds: string[] = siteUserParam.roleIds;
const sysUserRoleParam: SysUserRoleParam = new SysUserRoleParam(); const sysUserRoleParam: SysUserRoleParam = new SysUserRoleParam();
sysUserRoleParam.siteId = this.requestContext.siteId; sysUserRoleParam.siteId = this.requestContext.siteId;
sysUserRoleParam.setRoleIds(JSONUtil.toJsonStr(roleIds)); sysUserRoleParam.roleIds = JSONUtil.toJsonStr(roleIds);
sysUserRoleParam.setUid(uid); sysUserRoleParam.uid = uid;
sysUserRoleParam.status = siteUserParam.status; sysUserRoleParam.status = siteUserParam.status;
this.sysUserRoleService.edit(sysUserRoleParam); this.sysUserRoleService.edit(sysUserRoleParam);
}catch (e){ }catch (e){
@@ -127,7 +127,7 @@ export class SiteUserServiceImplService {
throw new BadRequestException("用户不存在"); throw new BadRequestException("用户不存在");
} }
const sysUserRole: SysUserRole = sysUserRoleList.get(0); const sysUserRole: SysUserRole = sysUserRoleList.get(0);
if (sysUserRole.getIsAdmin() == 1){ if (sysUserRole.isAdmin == 1){
throw new BadRequestException("超级管理员不允许删除"); throw new BadRequestException("超级管理员不允许删除");
} }
this.sysUserRepository.delete(uid); this.sysUserRepository.delete(uid);

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

@@ -52,38 +52,38 @@ export class StatHourServiceImplService {
async add(addParam: StatHourParam): Promise<any> { async add(addParam: StatHourParam): Promise<any> {
const model: StatHour = new StatHour(); const model: StatHour = new StatHour();
model.siteId = addParam.siteId; model.siteId = addParam.siteId;
model.setAddon(addParam.getAddon()); model.addon = addParam.addon;
model.setField(addParam.getField()); model.field = addParam.field;
model.setFieldTotal(addParam.getFieldTotal()); model.fieldTotal = addParam.fieldTotal;
model.setYear(addParam.getYear()); model.year = addParam.year;
model.setMonth(addParam.getMonth()); model.month = addParam.month;
model.setDay(addParam.getDay()); model.day = addParam.day;
model.setStartTime(Date.now() / 1000); model.startTime = Date.now( / 1000);
model.setLastTime(addParam.getLastTime()); model.lastTime = addParam.lastTime;
model.setHour0(addParam.getHour0()); model.hour0 = addParam.hour0;
model.setHour1(addParam.getHour1()); model.hour1 = addParam.hour1;
model.setHour2(addParam.getHour2()); model.hour2 = addParam.hour2;
model.setHour3(addParam.getHour3()); model.hour3 = addParam.hour3;
model.setHour4(addParam.getHour4()); model.hour4 = addParam.hour4;
model.setHour5(addParam.getHour5()); model.hour5 = addParam.hour5;
model.setHour6(addParam.getHour6()); model.hour6 = addParam.hour6;
model.setHour7(addParam.getHour7()); model.hour7 = addParam.hour7;
model.setHour8(addParam.getHour8()); model.hour8 = addParam.hour8;
model.setHour9(addParam.getHour9()); model.hour9 = addParam.hour9;
model.setHour10(addParam.getHour10()); model.hour10 = addParam.hour10;
model.setHour11(addParam.getHour11()); model.hour11 = addParam.hour11;
model.setHour12(addParam.getHour12()); model.hour12 = addParam.hour12;
model.setHour13(addParam.getHour13()); model.hour13 = addParam.hour13;
model.setHour14(addParam.getHour14()); model.hour14 = addParam.hour14;
model.setHour15(addParam.getHour15()); model.hour15 = addParam.hour15;
model.setHour16(addParam.getHour16()); model.hour16 = addParam.hour16;
model.setHour17(addParam.getHour17()); model.hour17 = addParam.hour17;
model.setHour18(addParam.getHour18()); model.hour18 = addParam.hour18;
model.setHour19(addParam.getHour19()); model.hour19 = addParam.hour19;
model.setHour20(addParam.getHour20()); model.hour20 = addParam.hour20;
model.setHour21(addParam.getHour21()); model.hour21 = addParam.hour21;
model.setHour22(addParam.getHour22()); model.hour22 = addParam.hour22;
model.setHour23(addParam.getHour23()); model.hour23 = addParam.hour23;
this.statHourRepository.save(model); this.statHourRepository.save(model);
} }
@@ -97,37 +97,37 @@ export class StatHourServiceImplService {
if (!model) throw new BadRequestException("数据不存在!"); if (!model) throw new BadRequestException("数据不存在!");
model.id = id; model.id = id;
model.siteId = editParam.siteId; model.siteId = editParam.siteId;
model.setAddon(editParam.getAddon()); model.addon = editParam.addon;
model.setField(editParam.getField()); model.field = editParam.field;
model.setFieldTotal(editParam.getFieldTotal()); model.fieldTotal = editParam.fieldTotal;
model.setYear(editParam.getYear()); model.year = editParam.year;
model.setMonth(editParam.getMonth()); model.month = editParam.month;
model.setDay(editParam.getDay()); model.day = editParam.day;
model.setLastTime(editParam.getLastTime()); model.lastTime = editParam.lastTime;
model.setHour0(editParam.getHour0()); model.hour0 = editParam.hour0;
model.setHour1(editParam.getHour1()); model.hour1 = editParam.hour1;
model.setHour2(editParam.getHour2()); model.hour2 = editParam.hour2;
model.setHour3(editParam.getHour3()); model.hour3 = editParam.hour3;
model.setHour4(editParam.getHour4()); model.hour4 = editParam.hour4;
model.setHour5(editParam.getHour5()); model.hour5 = editParam.hour5;
model.setHour6(editParam.getHour6()); model.hour6 = editParam.hour6;
model.setHour7(editParam.getHour7()); model.hour7 = editParam.hour7;
model.setHour8(editParam.getHour8()); model.hour8 = editParam.hour8;
model.setHour9(editParam.getHour9()); model.hour9 = editParam.hour9;
model.setHour10(editParam.getHour10()); model.hour10 = editParam.hour10;
model.setHour11(editParam.getHour11()); model.hour11 = editParam.hour11;
model.setHour12(editParam.getHour12()); model.hour12 = editParam.hour12;
model.setHour13(editParam.getHour13()); model.hour13 = editParam.hour13;
model.setHour14(editParam.getHour14()); model.hour14 = editParam.hour14;
model.setHour15(editParam.getHour15()); model.hour15 = editParam.hour15;
model.setHour16(editParam.getHour16()); model.hour16 = editParam.hour16;
model.setHour17(editParam.getHour17()); model.hour17 = editParam.hour17;
model.setHour18(editParam.getHour18()); model.hour18 = editParam.hour18;
model.setHour19(editParam.getHour19()); model.hour19 = editParam.hour19;
model.setHour20(editParam.getHour20()); model.hour20 = editParam.hour20;
model.setHour21(editParam.getHour21()); model.hour21 = editParam.hour21;
model.setHour22(editParam.getHour22()); model.hour22 = editParam.hour22;
model.setHour23(editParam.getHour23()); model.hour23 = editParam.hour23;
statHourMapper.updateById(model); statHourMapper.updateById(model);
} }

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

@@ -24,38 +24,38 @@ export class StatServiceImplService {
const statToDayVo: StatToDayVo = new StatToDayVo(); const statToDayVo: StatToDayVo = new StatToDayVo();
//总会员数 //总会员数
const totalMemberCount: number = this.coreMemberService.getMemberCount(new MemberStatSearchParam()); const totalMemberCount: number = this.coreMemberService.getMemberCount(new MemberStatSearchParam());
statToDayVo.setTotalMemberCount(totalMemberCount); statToDayVo.totalMemberCount = totalMemberCount;
//今天注册总会员数 //今天注册总会员数
const todayMemberParam: MemberStatSearchParam = new MemberStatSearchParam(); const todayMemberParam: MemberStatSearchParam = new MemberStatSearchParam();
todayMemberParam.createTime = createTimes; todayMemberParam.createTime = createTimes;
statToDayVo.setTodayMemberCount(this.coreMemberService.getMemberCount(todayMemberParam)); statToDayVo.todayMemberCount = this.coreMemberService.getMemberCount(todayMemberParam);
//总站点数 //总站点数
statToDayVo.setTotalSiteCount(this.siteService.getSiteCountByCondition(new SiteSearchParam())); statToDayVo.totalSiteCount = this.siteService.getSiteCountByCondition(new SiteSearchParam());
//今日站点数 //今日站点数
const todaySiteParam: SiteSearchParam = new SiteSearchParam(); const todaySiteParam: SiteSearchParam = new SiteSearchParam();
todaySiteParam.createTime = createTimes; todaySiteParam.createTime = createTimes;
todaySiteParam.setAppType(AppTypeEnum.path.basename(SITE)); todaySiteParam.appType = AppTypeEnum.path.basename(SITE);
statToDayVo.setTodaySiteCount(this.siteService.getSiteCountByCondition(todaySiteParam)); statToDayVo.todaySiteCount = this.siteService.getSiteCountByCondition(todaySiteParam);
//正常站点数 //正常站点数
const normaSiteParam: SiteSearchParam = new SiteSearchParam(); const normaSiteParam: SiteSearchParam = new SiteSearchParam();
normaSiteParam.status = 1; normaSiteParam.status = 1;
normaSiteParam.setAppType(AppTypeEnum.path.basename(SITE)); normaSiteParam.appType = AppTypeEnum.path.basename(SITE);
statToDayVo.setNormaSiteCount(this.siteService.getSiteCountByCondition(normaSiteParam)); statToDayVo.normaSiteCount = this.siteService.getSiteCountByCondition(normaSiteParam);
//到期站点数 //到期站点数
const expireSiteParam: SiteSearchParam = new SiteSearchParam(); const expireSiteParam: SiteSearchParam = new SiteSearchParam();
expireSiteParam.status = 2; expireSiteParam.status = 2;
expireSiteParam.setAppType(AppTypeEnum.path.basename(SITE)); expireSiteParam.appType = AppTypeEnum.path.basename(SITE);
statToDayVo.setExpireSiteCount(this.siteService.getSiteCountByCondition(expireSiteParam)); statToDayVo.expireSiteCount = this.siteService.getSiteCountByCondition(expireSiteParam);
//即将到期站点数 //即将到期站点数
const weekExpireSiteParam: SiteSearchParam = new SiteSearchParam(); const weekExpireSiteParam: SiteSearchParam = new SiteSearchParam();
const expireTimes: string[] = new String[2]; const expireTimes: string[] = new String[2];
expireTimes[0] = DateUtils.currDate(); expireTimes[0] = DateUtils.currDate();
expireTimes[1] = DateUtils.getDateAddDay(7); expireTimes[1] = DateUtils.getDateAddDay(7);
weekExpireSiteParam.status = 1; weekExpireSiteParam.status = 1;
weekExpireSiteParam.setExpireTime(expireTimes); weekExpireSiteParam.expireTime = expireTimes;
weekExpireSiteParam.setAppType(AppTypeEnum.path.basename(SITE)); weekExpireSiteParam.appType = AppTypeEnum.path.basename(SITE);
statToDayVo.setWeekExpireSiteCount(this.siteService.getSiteCountByCondition(weekExpireSiteParam)); statToDayVo.weekExpireSiteCount = this.siteService.getSiteCountByCondition(weekExpireSiteParam);
/** /**
* 系统数据类 * 系统数据类
@@ -63,8 +63,8 @@ export class StatServiceImplService {
const statSystemVo: StatSystemVo = new StatSystemVo(); const statSystemVo: StatSystemVo = new StatSystemVo();
statSystemVo = this.systemService.info; statSystemVo = this.systemService.info;
statInfoVo.setTodayData(statToDayVo); statInfoVo.todayData = statToDayVo;
statInfoVo.setSystem(statSystemVo); statInfoVo.system = statSystemVo;
/** /**
* 站点、会员数据统计数据 * 站点、会员数据统计数据
@@ -90,13 +90,13 @@ export class StatServiceImplService {
const itemSiteCount: number = this.siteService.getSiteCountByCondition(itemSiteParam); const itemSiteCount: number = this.siteService.getSiteCountByCondition(itemSiteParam);
siteValues.push(itemSiteCount); siteValues.push(itemSiteCount);
} }
memberCountVo.setDate(dates); memberCountVo.date = dates;
memberCountVo.value = memberValues; memberCountVo.value = memberValues;
siteCountVo.setDate(dates); siteCountVo.date = dates;
siteCountVo.value = siteValues; siteCountVo.value = siteValues;
statInfoVo.setMemberCountStat(memberCountVo); statInfoVo.memberCountStat = memberCountVo;
statInfoVo.setSiteStat(siteCountVo); statInfoVo.siteStat = siteCountVo;
/** /**
* 会员性别类型统计 * 会员性别类型统计
@@ -109,16 +109,16 @@ export class StatServiceImplService {
const sexCountList: number[] = []; const sexCountList: number[] = [];
const sexMemberParam: MemberStatSearchParam = new MemberStatSearchParam(); const sexMemberParam: MemberStatSearchParam = new MemberStatSearchParam();
sexMemberParam.setSex(SexEnum.MAN.value); sexMemberParam.sex = SexEnum.MAN.value;
const manSexCount: number = this.coreMemberService.getMemberCount(sexMemberParam); const manSexCount: number = this.coreMemberService.getMemberCount(sexMemberParam);
sexMemberParam.setSex(SexEnum.WOMAN.value); sexMemberParam.sex = SexEnum.WOMAN.value;
const womanSexCount: number = this.coreMemberService.getMemberCount(sexMemberParam); const womanSexCount: number = this.coreMemberService.getMemberCount(sexMemberParam);
sexCountList.push(manSexCount); sexCountList.push(manSexCount);
sexCountList.push(womanSexCount); sexCountList.push(womanSexCount);
sexCountList.push(totalMemberCount - manSexCount - womanSexCount); sexCountList.push(totalMemberCount - manSexCount - womanSexCount);
memberStat.type = sexlist; memberStat.type = sexlist;
memberStat.value = sexCountList; memberStat.value = sexCountList;
statInfoVo.setMemberStat(memberStat); statInfoVo.memberStat = memberStat;
/** /**
* 站点分组 统计 * 站点分组 统计
@@ -127,26 +127,26 @@ export class StatServiceImplService {
const grouplist: string[] = []; const grouplist: string[] = [];
const groupCountList: number[] = []; const groupCountList: number[] = [];
const groupList: SiteGroup[] = this.siteGroupService.getAll(); const groupList: SiteGroup[] = this.siteGroupService.all;
for (const siteGroup of groupList) { for (const siteGroup of groupList) {
grouplist.push(siteGroup.getGroupName()); grouplist.push(siteGroup.groupName);
const siteGroupParam: SiteSearchParam = new SiteSearchParam(); const siteGroupParam: SiteSearchParam = new SiteSearchParam();
siteGroupParam.setGroupId(siteGroup.getGroupId()); siteGroupParam.groupId = siteGroup.groupId;
groupCountList.push(this.siteService.getSiteCountByCondition(siteGroupParam)); groupCountList.push(this.siteService.getSiteCountByCondition(siteGroupParam));
} }
siteGroupStat.type = grouplist; siteGroupStat.type = grouplist;
siteGroupStat.value = groupCountList; siteGroupStat.value = groupCountList;
statInfoVo.setSiteGroupStat(siteGroupStat); statInfoVo.siteGroupStat = siteGroupStat;
/** /**
* 所有应用安装统计 * 所有应用安装统计
*/ */
const appVo: StatAppVo = new StatAppVo(); const appVo: StatAppVo = new StatAppVo();
const totalAddonCount: number = this.coreAddonService.getLocalAddonCount(); const totalAddonCount: number = this.coreAddonService.localAddonCount;
const installAddonCount: number = this.coreAddonService.getAddonCountByCondition(new CoreAddonSearchParam()); const installAddonCount: number = this.coreAddonService.getAddonCountByCondition(new CoreAddonSearchParam());
appVo.setAppCount(totalAddonCount); appVo.appCount = totalAddonCount;
appVo.setAppInstalledCount(installAddonCount); appVo.appInstalledCount = installAddonCount;
appVo.setAppNoInstalledCount(Math.max(totalAddonCount - installAddonCount, 0)); appVo.appNoInstalledCount = Math.max(totalAddonCount - installAddonCount, 0);
statInfoVo.setApp(appVo); statInfoVo.app = appVo;
return statInfoVo; return statInfoVo;
} }
} }

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

@@ -41,6 +41,6 @@ export class SysAgreementServiceImplService {
* setAgreement * setAgreement
*/ */
async setAgreement(key: string, title: string, content: string): Promise<any> { async setAgreement(key: string, title: string, content: string): Promise<any> {
this.coreAgreementService.setAgreement(this.requestContext.siteId, key, title, content); this.coreAgreementService.agreement = this.requestContext.siteId, key, title, content;
} }
} }

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

@@ -28,16 +28,16 @@ export class SysAttachmentServiceImplService {
any /* TODO: QueryWrapper<SysAttachment> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<SysAttachment> */ queryWrapper = new QueryWrapper();
queryWrapper.eq("site_id", this.requestContext.siteId); queryWrapper.eq("site_id", this.requestContext.siteId);
queryWrapper.orderByDesc("att_id"); queryWrapper.orderByDesc("att_id");
if (CommonUtils.isNotEmpty(searchParam.getAttType())) queryWrapper.eq("att_type", searchParam.getAttType()); if (CommonUtils.isNotEmpty(searchParam.attType)) queryWrapper.eq("att_type", searchParam.attType);
if (CommonUtils.isNotEmpty(searchParam.getCateId()) && searchParam.getCateId() > 0) queryWrapper.eq("cate_id", searchParam.getCateId()); if (CommonUtils.isNotEmpty(searchParam.cateId) && searchParam.cateId > 0) queryWrapper.eq("cate_id", searchParam.cateId);
if (CommonUtils.isNotEmpty(searchParam.getRealName())) queryWrapper.like("real_name", searchParam.getRealName()); if (CommonUtils.isNotEmpty(searchParam.realName)) queryWrapper.like("real_name", searchParam.realName);
[SysAttachment[], number] iPage = this.sysAttachmentRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); [SysAttachment[], number] iPage = this.sysAttachmentRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
const list: SysAttachmentListVo[] = []; const list: SysAttachmentListVo[] = [];
for (const item of iPageRecords) { for (const item of iPageRecords) {
const vo: SysAttachmentListVo = new SysAttachmentListVo(); const vo: SysAttachmentListVo = new SysAttachmentListVo();
Object.assign(vo, item); Object.assign(vo, item);
vo.setThumb(CommonUtils.thumbImageSmall(item.siteId, item.path)); vo.thumb = CommonUtils.thumbImageSmall(item.siteId, item.path);
list.push(vo); list.push(vo);
} }
return PageResult.build(page, limit, iPageTotal).setData(list); return PageResult.build(page, limit, iPageTotal).setData(list);
@@ -48,8 +48,8 @@ export class SysAttachmentServiceImplService {
*/ */
async image(param: AttachmentUploadParam): Promise<any> { async image(param: AttachmentUploadParam): Promise<any> {
param.siteId = this.requestContext.siteId; param.siteId = this.requestContext.siteId;
param.setAttType("image"); param.attType = "image";
param.setDir("attachment/image/" + param.siteId + "/" + DateFormatUtils.getUploadFormat() + "/"); param.dir = "attachment/image/" + param.siteId + "/" + DateFormatUtils.uploadFormat + "/";
return this.coreUploadService.upload(param); return this.coreUploadService.upload(param);
} }
@@ -58,8 +58,8 @@ export class SysAttachmentServiceImplService {
*/ */
async video(param: AttachmentUploadParam): Promise<any> { async video(param: AttachmentUploadParam): Promise<any> {
param.siteId = this.requestContext.siteId; param.siteId = this.requestContext.siteId;
param.setAttType("video"); param.attType = "video";
param.setDir("attachment/video/" + param.siteId + "/" + DateFormatUtils.getUploadFormat() + "/"); param.dir = "attachment/video/" + param.siteId + "/" + DateFormatUtils.uploadFormat + "/";
return this.coreUploadService.upload(param); return this.coreUploadService.upload(param);
} }
@@ -68,10 +68,10 @@ export class SysAttachmentServiceImplService {
*/ */
async document(param: AttachmentUploadParam): Promise<any> { async document(param: AttachmentUploadParam): Promise<any> {
param.siteId = this.requestContext.siteId; param.siteId = this.requestContext.siteId;
param.setIsAttachment(0); param.isAttachment = 0;
param.setAttType("document"); param.attType = "document";
param.setStorageType("local"); param.storageType = "local";
param.setDir("attachment/document/" + param.getDocumentType() + "/" + param.siteId + "/" + DateFormatUtils.getUploadFormat() + "/"); param.dir = "attachment/document/" + param.documentType + "/" + param.siteId + "/" + DateFormatUtils.uploadFormat + "/";
return this.coreUploadService.upload(param); return this.coreUploadService.upload(param);
} }
@@ -80,10 +80,10 @@ export class SysAttachmentServiceImplService {
*/ */
async batchMoveCategory(param: SysAttachmentMoveParam): Promise<any> { async batchMoveCategory(param: SysAttachmentMoveParam): Promise<any> {
const model: SysAttachment = new SysAttachment(); const model: SysAttachment = new SysAttachment();
model.setCateId(param.getCateId()); model.cateId = param.cateId;
this.sysAttachmentRepository.save(model, /* TODO: any /* TODO: QueryWrapper<SysAttachment> */需改写为TypeORM的where条件对象 */ this.sysAttachmentRepository.save(model, /* TODO: any /* TODO: QueryWrapper<SysAttachment> */需改写为TypeORM的where条件对象 */
.eq("site_id", this.requestContext.siteId) .eq("site_id", this.requestContext.siteId)
.in("att_id", param.getAttIds())); .in("att_id", param.attIds));
} }
/** /**
@@ -91,14 +91,14 @@ export class SysAttachmentServiceImplService {
*/ */
async del(param: SysAttachmentDelParam): Promise<any> { async del(param: SysAttachmentDelParam): Promise<any> {
const sysAttachmentList: SysAttachment[] = this.sysAttachmentRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) const sysAttachmentList: SysAttachment[] = this.sysAttachmentRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))
.in("att_id", param.getAttIds())); .in("att_id", param.attIds));
if ((!sysAttachmentList || sysAttachmentList.length === 0)) { if ((!sysAttachmentList || sysAttachmentList.length === 0)) {
throw new BadRequestException("请选择要删除的附件"); throw new BadRequestException("请选择要删除的附件");
} }
for (const sysAttachment of sysAttachmentList) { for (const sysAttachment of sysAttachmentList) {
this.coreUploadService.delete(sysAttachment.siteId, sysAttachment.getStorageType(), sysAttachment.path); this.coreUploadService.delete(sysAttachment.siteId, sysAttachment.storageType, sysAttachment.path);
} }
this.sysAttachmentRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ })).in("att_id", param.getAttIds())); this.sysAttachmentRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ })).in("att_id", param.attIds));
} }
/** /**

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

@@ -29,8 +29,8 @@ export class SysBackupRecordsServiceImplService {
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time");
if (searchParam != null) { if (searchParam != null) {
if (searchParam.getContent() != null) { if (searchParam.content != null) {
queryWrapper.like("content", searchParam.getContent()); queryWrapper.like("content", searchParam.content);
} }
} }
@@ -40,9 +40,9 @@ export class SysBackupRecordsServiceImplService {
const vo: SysBackupRecordsListVo = new SysBackupRecordsListVo(); const vo: SysBackupRecordsListVo = new SysBackupRecordsListVo();
Object.assign(vo, item); Object.assign(vo, item);
vo.createTime = DateUtils.timestampToString(item.createTime); vo.createTime = DateUtils.timestampToString(item.createTime);
vo.setCompleteTime(DateUtils.timestampToString(item.getCompleteTime())); vo.completeTime = DateUtils.timestampToString(item.completeTime);
vo.setStatusName(BackupRecordStatusEnum.getNameByStatus(vo.status)); vo.statusName = BackupRecordStatusEnum.getNameByStatus(vo.status);
vo.setBackupDir("webroot/runtime/upgrade/"+vo.getBackupKey()+"/backup"); vo.backupDir = "webroot/runtime/upgrade/"+vo.backupKey+"/backup";
list.push(vo); list.push(vo);
} }
@@ -83,21 +83,21 @@ export class SysBackupRecordsServiceImplService {
async del(delParam: SysBackupRecordsDelParam): Promise<any> { async del(delParam: SysBackupRecordsDelParam): Promise<any> {
const queryWrapper: QueryWrapper = /* TODO: any /* TODO: QueryWrapper<SysUpgradeRecords> */需改写为TypeORM的where条件对象 */; const queryWrapper: QueryWrapper = /* TODO: any /* TODO: QueryWrapper<SysUpgradeRecords> */需改写为TypeORM的where条件对象 */;
if (delParam.getIds() instanceof ArrayList<?>) { if (delParam.ids instanceof ArrayList<?>) {
const intArray: number[] = []; const intArray: number[] = [];
((ArrayList<?>) delParam.getIds()).forEach(item => { ((ArrayList<?>) delParam.ids).forEach(item => {
if (!item) throw new BadRequestException("id不能为空"); if (!item) throw new BadRequestException("id不能为空");
intArray.push(item); intArray.push(item);
}); });
queryWrapper.in("id", intArray); queryWrapper.in("id", intArray);
} else { } else {
queryWrapper.eq("id", delParam.getIds()); queryWrapper.eq("id", delParam.ids);
} }
const backupRecords: SysBackupRecords[] = this.sysBackupRecordsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); const backupRecords: SysBackupRecords[] = this.sysBackupRecordsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
if (CommonUtils.isNotEmpty(backupRecords)) { if (CommonUtils.isNotEmpty(backupRecords)) {
for (const item of backupRecords) { for (const item of backupRecords) {
const file: string = backupDir(item.getBackupKey(), "backup"); const file: string = backupDir(item.backupKey, "backup");
if (fs.existsSync(file)) { if (fs.existsSync(file)) {
try { try {
fs.rmSync(file, { recursive: true, force: true }); fs.rmSync(file, { recursive: true, force: true });
@@ -127,43 +127,43 @@ export class SysBackupRecordsServiceImplService {
steps.put("restoreSql", new BackupTaskVo.Step("restoreSql", "恢复数据库备份")); steps.put("restoreSql", new BackupTaskVo.Step("restoreSql", "恢复数据库备份"));
steps.put("restoreComplete", new BackupTaskVo.Step("restoreComplete", "恢复完成")); steps.put("restoreComplete", new BackupTaskVo.Step("restoreComplete", "恢复完成"));
vo.key = RandomUtil.randomString(10); vo.key = RandomUtil.randomString(10);
vo.setSteps(steps); vo.steps = steps;
vo.setStep("startRestore"); vo.step = "startRestore";
vo.getExecuted().add("startRestore"); vo.executed.add("startRestore");
vo.setContent("开始恢复"); vo.content = "开始恢复";
vo.setTask(""); vo.task = "";
const addParam: SysBackupRecordsParam = new SysBackupRecordsParam(); const addParam: SysBackupRecordsParam = new SysBackupRecordsParam();
addParam.setBackupKey(vo.key); addParam.backupKey = vo.key;
addParam.status = BackupRecordStatusEnum.STATUS_READY.status; addParam.status = BackupRecordStatusEnum.STATUS_READY.status;
addParam.setContent("自动备份"); addParam.content = "自动备份";
addParam.version = this.appConfig.version; addParam.version = this.appConfig.version;
add(addParam); add(addParam);
} }
vo.setBackupRecord(record); vo.backupRecord = record;
if (!vo.getTask() === "") return vo; if (!vo.task === "") return vo;
const steps: string[] = vo.getSteps().keySet().stream(); const steps: string[] = vo.steps.keySet().stream();
const step: string = steps.indexOf(vo.getStep()) < steps.length - 1 ? steps.get(steps.indexOf(vo.getStep()) + 1) : ""; const step: string = steps.indexOf(vo.step) < steps.length - 1 ? steps.get(steps.indexOf(vo.step) + 1) : "";
if ((step && step.length > 0)) { if ((step && step.length > 0)) {
if (!vo.getExecuted().includes(step)) { if (!vo.executed.includes(step)) {
vo.getExecuted().add(step); vo.executed.add(step);
} }
try { try {
const param: Record<String, Object> = null; const param: Record<String, Object> = null;
param = (Record<String, Object>) dynamicMethodCall(step, vo); param = (Record<String, Object>) dynamicMethodCall(step, vo);
if (param != null) { if (param != null) {
vo.setParams(param); vo.params = param;
} else { } else {
vo.setStep(step); vo.step = step;
vo.setParams(null); vo.params = null;
} }
setBackupRestoreTaskCache(vo); setBackupRestoreTaskCache(vo);
} catch (e) { } catch (e) {
vo.setStep(step); vo.step = step;
vo.setTask("fail"); vo.task = "fail";
vo.setContent("备份恢复失败，稍后请手动恢复，备份文件路径：webroot/runtime/upgrade/"+ record.getBackupKey() +"/backup，失败原因：" + e.message); vo.content = "备份恢复失败，稍后请手动恢复，备份文件路径：webroot/runtime/upgrade/"+ record.backupKey +"/backup，失败原因：" + e.message;
setBackupRestoreTaskCache(vo); setBackupRestoreTaskCache(vo);
// 删除备份记录 // 删除备份记录
this.sysBackupRecordsRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ }))); this.sysBackupRecordsRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ })));
@@ -184,39 +184,39 @@ export class SysBackupRecordsServiceImplService {
if (vo == null) { if (vo == null) {
vo = new BackupTaskVo(); vo = new BackupTaskVo();
vo.key = RandomUtil.randomString(10); vo.key = RandomUtil.randomString(10);
vo.setStep("startBackup"); vo.step = "startBackup";
vo.getExecuted().add("startBackup"); vo.executed.add("startBackup");
vo.setContent("开始备份"); vo.content = "开始备份";
const addParam: SysBackupRecordsParam = new SysBackupRecordsParam(); const addParam: SysBackupRecordsParam = new SysBackupRecordsParam();
addParam.setBackupKey(vo.key); addParam.backupKey = vo.key;
addParam.status = BackupRecordStatusEnum.STATUS_READY.status; addParam.status = BackupRecordStatusEnum.STATUS_READY.status;
addParam.setContent("手动备份"); addParam.content = "手动备份";
addParam.version = this.appConfig.version; addParam.version = this.appConfig.version;
add(addParam); add(addParam);
} }
const steps: string[] = vo.getSteps().keySet().stream(); const steps: string[] = vo.steps.keySet().stream();
const step: string = steps.indexOf(vo.getStep()) < steps.length - 1 ? steps.get(steps.indexOf(vo.getStep()) + 1) : ""; const step: string = steps.indexOf(vo.step) < steps.length - 1 ? steps.get(steps.indexOf(vo.step) + 1) : "";
if ((step && step.length > 0)) { if ((step && step.length > 0)) {
if (!vo.getExecuted().includes(step)) { if (!vo.executed.includes(step)) {
vo.getExecuted().add(step); vo.executed.add(step);
} }
try { try {
const param: Record<String, Object> = null; const param: Record<String, Object> = null;
param = (Record<String, Object>) dynamicMethodCall(step, vo); param = (Record<String, Object>) dynamicMethodCall(step, vo);
if (param != null) { if (param != null) {
vo.setParams(param); vo.params = param;
} else { } else {
vo.setStep(step); vo.step = step;
vo.setParams(null); vo.params = null;
} }
setBackupTaskCache(vo); setBackupTaskCache(vo);
} catch (e) { } catch (e) {
vo.setStep(step); vo.step = step;
vo.setTask("fail"); vo.task = "fail";
vo.setContent("备份失败，稍后请重新手动备份，失败原因：" + e.message); vo.content = "备份失败，稍后请重新手动备份，失败原因：" + e.message;
setBackupTaskCache(vo); setBackupTaskCache(vo);
// 删除备份记录 // 删除备份记录
this.sysBackupRecordsRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ }))); this.sysBackupRecordsRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ })));
@@ -235,10 +235,10 @@ export class SysBackupRecordsServiceImplService {
async backupComplete(vo: BackupTaskVo): Promise<any> { async backupComplete(vo: BackupTaskVo): Promise<any> {
const backupRecord: SysBackupRecords = new SysBackupRecords(); const backupRecord: SysBackupRecords = new SysBackupRecords();
backupRecord.status = UpgradeRecordStatusEnum.STATUS_COMPLETE.status; backupRecord.status = UpgradeRecordStatusEnum.STATUS_COMPLETE.status;
backupRecord.setCompleteTime(Date.now() / 1000); backupRecord.completeTime = Date.now( / 1000);
this.sysBackupRecordsRepository.save(backupRecord, /* TODO: any /* TODO: QueryWrapper<SysBackupRecords> */需改写为TypeORM的where条件对象 */.eq("backup_key", vo.key)); this.sysBackupRecordsRepository.save(backupRecord, /* TODO: any /* TODO: QueryWrapper<SysBackupRecords> */需改写为TypeORM的where条件对象 */.eq("backup_key", vo.key));
vo.setTask("end"); vo.task = "end";
this.sysUpgradeRecordsService.clearBackupTaskCache(5); this.sysUpgradeRecordsService.clearBackupTaskCache(5);
} }
@@ -249,7 +249,7 @@ export class SysBackupRecordsServiceImplService {
async restoreBackupComplete(vo: BackupTaskVo): Promise<any> { async restoreBackupComplete(vo: BackupTaskVo): Promise<any> {
const backupRecord: SysBackupRecords = new SysBackupRecords(); const backupRecord: SysBackupRecords = new SysBackupRecords();
backupRecord.status = UpgradeRecordStatusEnum.STATUS_COMPLETE.status; backupRecord.status = UpgradeRecordStatusEnum.STATUS_COMPLETE.status;
backupRecord.setCompleteTime(Date.now() / 1000); backupRecord.completeTime = Date.now( / 1000);
this.sysBackupRecordsRepository.save(backupRecord, /* TODO: any /* TODO: QueryWrapper<SysBackupRecords> */需改写为TypeORM的where条件对象 */.eq("backup_key", vo.key)); this.sysBackupRecordsRepository.save(backupRecord, /* TODO: any /* TODO: QueryWrapper<SysBackupRecords> */需改写为TypeORM的where条件对象 */.eq("backup_key", vo.key));
} }
@@ -257,7 +257,7 @@ export class SysBackupRecordsServiceImplService {
* restoreComplete * restoreComplete
*/ */
async restoreComplete(vo: BackupTaskVo): Promise<any> { async restoreComplete(vo: BackupTaskVo): Promise<any> {
vo.setTask("end"); vo.task = "end";
this.sysUpgradeRecordsService.clearRestoreTaskCache(5); this.sysUpgradeRecordsService.clearRestoreTaskCache(5);
} }
@@ -265,7 +265,7 @@ export class SysBackupRecordsServiceImplService {
* setBackupTaskCache * setBackupTaskCache
*/ */
async setBackupTaskCache(vo: BackupTaskVo): Promise<any> { async setBackupTaskCache(vo: BackupTaskVo): Promise<any> {
const cache: Cached = CacheFactory.getCacheOperator(); const cache: Cached = CacheFactory.cacheOperator;
cache.put("backup_task", JsonUtils.parseObject<any>(vo).toString(), 1800); cache.put("backup_task", JsonUtils.parseObject<any>(vo).toString(), 1800);
} }
@@ -273,7 +273,7 @@ export class SysBackupRecordsServiceImplService {
* setBackupRestoreTaskCache * setBackupRestoreTaskCache
*/ */
async setBackupRestoreTaskCache(vo: BackupTaskVo): Promise<any> { async setBackupRestoreTaskCache(vo: BackupTaskVo): Promise<any> {
const cache: Cached = CacheFactory.getCacheOperator(); const cache: Cached = CacheFactory.cacheOperator;
cache.put("backup_restore_task", JsonUtils.parseObject<any>(vo).toString(), 1800); cache.put("backup_restore_task", JsonUtils.parseObject<any>(vo).toString(), 1800);
} }
@@ -287,7 +287,7 @@ export class SysBackupRecordsServiceImplService {
} catch (e) { } catch (e) {
} }
} }
const cache: Cached = CacheFactory.getCacheOperator(); const cache: Cached = CacheFactory.cacheOperator;
cache.remove("backup_task"); cache.remove("backup_task");
} }
@@ -301,7 +301,7 @@ export class SysBackupRecordsServiceImplService {
} catch (e) { } catch (e) {
} }
} }
const cache: Cached = CacheFactory.getCacheOperator(); const cache: Cached = CacheFactory.cacheOperator;
cache.remove("backup_restore_task"); cache.remove("backup_restore_task");
} }
@@ -309,7 +309,7 @@ export class SysBackupRecordsServiceImplService {
* getBackupTask * getBackupTask
*/ */
async getBackupTask(): Promise<any> { async getBackupTask(): Promise<any> {
const cache: Cached = CacheFactory.getCacheOperator(); const cache: Cached = CacheFactory.cacheOperator;
const data: Object = cache.get("backup_task"); const data: Object = cache.get("backup_task");
if (data == null) return null; if (data == null) return null;
return Object.assign(new BackupTaskVo(), JsonUtils.parseObject<any>(data)) /* TODO: 检查BackupTaskVo构造函数 */; return Object.assign(new BackupTaskVo(), JsonUtils.parseObject<any>(data)) /* TODO: 检查BackupTaskVo构造函数 */;
@@ -319,7 +319,7 @@ export class SysBackupRecordsServiceImplService {
* getRestoreTask * getRestoreTask
*/ */
async getRestoreTask(): Promise<any> { async getRestoreTask(): Promise<any> {
const cache: Cached = CacheFactory.getCacheOperator(); const cache: Cached = CacheFactory.cacheOperator;
const data: Object = cache.get("backup_restore_task"); const data: Object = cache.get("backup_restore_task");
if (data == null) return null; if (data == null) return null;
return Object.assign(new BackupTaskVo(), JsonUtils.parseObject<any>(data)) /* TODO: 检查BackupTaskVo构造函数 */; return Object.assign(new BackupTaskVo(), JsonUtils.parseObject<any>(data)) /* TODO: 检查BackupTaskVo构造函数 */;
@@ -405,13 +405,13 @@ export class SysBackupRecordsServiceImplService {
async dynamicMethodCall(methodName: string, args: ): Promise<any> { async dynamicMethodCall(methodName: string, args: ): Promise<any> {
try { try {
// 获取当前类的 Class 对象 // 获取当前类的 Class 对象
Class<?> clazz = this.getClass(); Class<?> clazz = this.class;
// 获取方法对象 // 获取方法对象
java.lang.reflect.const method: Method = clazz.getMethod(methodName, extractParameterTypes(args)); java.lang.reflect.const method: Method = clazz.getMethod(methodName, extractParameterTypes(args));
// 调用方法 // 调用方法
console.log("dynamicMethodCall method：" + methodName); console.log("dynamicMethodCall method：" + methodName);
const result: Object = method.invoke(this, args); const result: Object = method.invoke(this, args);
if (method.getReturnType() == void.class) { if (method.returnType == void.class) {
return null; return null;
} else { } else {
return result; return result;

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

@@ -27,7 +27,7 @@ export class SysConfigServiceImplService {
* setWebSite * setWebSite
*/ */
async setWebSite(configParam: SysWebsiteParam): Promise<any> { async setWebSite(configParam: SysWebsiteParam): Promise<any> {
this.coreSysConfigService.setWebSite(this.requestContext.siteId, configParam); this.coreSysConfigService.webSite = this.requestContext.siteId, configParam;
} }
/** /**
@@ -48,7 +48,7 @@ export class SysConfigServiceImplService {
* setCopyRight * setCopyRight
*/ */
async setCopyRight(configParam: SysCopyRightParam): Promise<any> { async setCopyRight(configParam: SysCopyRightParam): Promise<any> {
this.coreSysConfigService.setCopyRight(this.requestContext.siteId, configParam); this.coreSysConfigService.copyRight = this.requestContext.siteId, configParam;
} }
/** /**
@@ -62,21 +62,21 @@ export class SysConfigServiceImplService {
* setMap * setMap
*/ */
async setMap(configParam: SysMapParam): Promise<any> { async setMap(configParam: SysMapParam): Promise<any> {
this.coreSysConfigService.setMap(this.requestContext.siteId, configParam); this.coreSysConfigService.map = this.requestContext.siteId, configParam;
} }
/** /**
* getDeveloperToken * getDeveloperToken
*/ */
async getDeveloperToken(): Promise<any> { async getDeveloperToken(): Promise<any> {
return this.coreSysConfigService.getDeveloperToken(); return this.coreSysConfigService.developerToken;
} }
/** /**
* setDeveloperToken * setDeveloperToken
*/ */
async setDeveloperToken(configParam: SysDeveloperTokenParam): Promise<any> { async setDeveloperToken(configParam: SysDeveloperTokenParam): Promise<any> {
this.coreSysConfigService.setDeveloperToken(configParam); this.coreSysConfigService.developerToken = configParam;
} }
/** /**
@@ -90,7 +90,7 @@ export class SysConfigServiceImplService {
* setLayout * setLayout
*/ */
async setLayout(configParam: JSONObject): Promise<any> { async setLayout(configParam: JSONObject): Promise<any> {
this.coreSysConfigService.setLayout(this.requestContext.siteId, configParam); this.coreSysConfigService.layout = this.requestContext.siteId, configParam;
} }
/** /**
@@ -104,7 +104,7 @@ export class SysConfigServiceImplService {
* setThemeColor * setThemeColor
*/ */
async setThemeColor(configParam: JSONObject): Promise<any> { async setThemeColor(configParam: JSONObject): Promise<any> {
this.coreSysConfigService.setThemeColor(this.requestContext.siteId, configParam); this.coreSysConfigService.themeColor = this.requestContext.siteId, configParam;
} }
/** /**
@@ -118,7 +118,7 @@ export class SysConfigServiceImplService {
* setLogin * setLogin
*/ */
async setLogin(configParam: SysLoginConfigParam): Promise<any> { async setLogin(configParam: SysLoginConfigParam): Promise<any> {
this.coreSysConfigService.setLogin(this.requestContext.siteId, configParam); this.coreSysConfigService.login = this.requestContext.siteId, configParam;
} }
/** /**

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

@@ -23,10 +23,10 @@ export class SysExportServiceImplService {
any /* TODO: QueryWrapper<SysExport> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<SysExport> */ queryWrapper = new QueryWrapper();
queryWrapper.orderByDesc("id"); queryWrapper.orderByDesc("id");
queryWrapper.like("export_key", searchParam.getExportKey()); queryWrapper.like("export_key", searchParam.exportKey);
if (CommonUtils.isNotEmpty(searchParam.getExportKey())) { if (CommonUtils.isNotEmpty(searchParam.exportKey)) {
queryWrapper.eq("export_status", searchParam.getExportStatus()); queryWrapper.eq("export_status", searchParam.exportStatus);
} }
if (CommonUtils.isNotEmpty(searchParam.createTime)) { if (CommonUtils.isNotEmpty(searchParam.createTime)) {
@@ -49,13 +49,13 @@ export class SysExportServiceImplService {
const vo: SysExportListVo = new SysExportListVo(); const vo: SysExportListVo = new SysExportListVo();
Object.assign(vo, export); Object.assign(vo, export);
vo.createTime = DateUtils.timestampToString(export.createTime); vo.createTime = DateUtils.timestampToString(export.createTime);
vo.setExportStatusName(ExportEnum.getNameByCode(export.getExportStatus())); vo.exportStatusName = ExportEnum.getNameByCode(export.exportStatus);
results results
.map(JSONUtil::parseObj) .map(JSONUtil::parseObj)
.filter(o => o.containsKey(export.getExportKey())) .filter(o => o.containsKey(export.exportKey))
.findFirst() .findFirst()
.map(o => o.getRecord<string, any>(export.getExportKey())) .map(o => o.getRecord<string, any>(export.exportKey))
.ifPresent(o => vo.setExportKeyName(o.getStr("name"))); .ifPresent(o => vo.exportKeyName = o.getStr("name"));
return vo; return vo;
}); });
@@ -80,8 +80,8 @@ export class SysExportServiceImplService {
*/ */
async checkExportData(type: string, param: Map<String, whereMap: Object>): Promise<any> { async checkExportData(type: string, param: Map<String, whereMap: Object>): Promise<any> {
const pageParam: PageParam = new PageParam(); const pageParam: PageParam = new PageParam();
pageParam.setPage(number.parseInt(whereMap.getOrDefault("page", 0).toString())); pageParam.page = number.parseInt(whereMap.getOrDefault("page", 0.toString()));
pageParam.setLimit(number.parseInt(whereMap.getOrDefault("limit", 0).toString())); pageParam.limit = number.parseInt(whereMap.getOrDefault("limit", 0.toString()));
const jsonArray: JSONArray = this.coreExportService.getExportData(this.requestContext.siteId, type, JsonUtils.parseObject<any>(whereMap), pageParam); const jsonArray: JSONArray = this.coreExportService.getExportData(this.requestContext.siteId, type, JsonUtils.parseObject<any>(whereMap), pageParam);
return (jsonArray && jsonArray.length > 0); return (jsonArray && jsonArray.length > 0);
} }
@@ -92,16 +92,16 @@ export class SysExportServiceImplService {
async exportData(type: string, param: Map<String, whereMap: Object>): Promise<any> { async exportData(type: string, param: Map<String, whereMap: Object>): Promise<any> {
const siteId: number = this.requestContext.siteId; const siteId: number = this.requestContext.siteId;
const pageParam: PageParam = new PageParam(); const pageParam: PageParam = new PageParam();
pageParam.setPage(whereMap.getOrDefault("page", 0)); pageParam.page = whereMap.getOrDefault("page", 0);
pageParam.setLimit(whereMap.getOrDefault("limit", 0)); pageParam.limit = whereMap.getOrDefault("limit", 0);
const dataColumn: JSONArray = this.coreExportService.getExportDataColumn(type); const dataColumn: JSONArray = this.coreExportService.getExportDataColumn(type);
const dataArray: JSONArray = this.coreExportService.getExportData(siteId, type, JsonUtils.parseObject<any>(whereMap), pageParam); const dataArray: JSONArray = this.coreExportService.getExportData(siteId, type, JsonUtils.parseObject<any>(whereMap), pageParam);
const export: SysExport = new SysExport(); const export: SysExport = new SysExport();
export.siteId = this.requestContext.siteId; export.siteId = this.requestContext.siteId;
export.setExportKey(type); export.exportKey = type;
export.setExportNum(CollectionUtil.size(dataArray)); export.exportNum = CollectionUtil.size(dataArray);
export.createTime = Date.now( / 1000); export.createTime = Date.now( / 1000);
this.coreExportService.push(export); this.coreExportService.push(export);

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

@@ -44,7 +44,7 @@ export class SysMenuServiceImplService {
* add * add
*/ */
async add(addParam: SysMenuParam): Promise<any> { async add(addParam: SysMenuParam): Promise<any> {
const sysMenu: SysMenu = this.find(addParam.getMenuKey(), addParam.appType); const sysMenu: SysMenu = this.find(addParam.menuKey, addParam.appType);
if(ObjectUtil.isNotNull(sysMenu)){ if(ObjectUtil.isNotNull(sysMenu)){
throw new AdminException("validate_menu.exit_menu_key"); throw new AdminException("validate_menu.exit_menu_key");
} }
@@ -52,7 +52,7 @@ export class SysMenuServiceImplService {
const model: SysMenu = new SysMenu(); const model: SysMenu = new SysMenu();
BeanUtil.copyProperties(addParam, model); BeanUtil.copyProperties(addParam, model);
model.createTime = DateUtils.currTime(); model.createTime = DateUtils.currTime();
model.setSource(MenuSourceEnum.CREATE.getCode()); model.source = MenuSourceEnum.CREATE.code;
this.sysMenuRepository.save(model); this.sysMenuRepository.save(model);
/** 清理缓存 */ /** 清理缓存 */
cached.tag(cacheTagName).clear(); cached.tag(cacheTagName).clear();
@@ -181,11 +181,11 @@ export class SysMenuServiceImplService {
const menuList: SysMenu[] = this.sysMenuRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); const menuList: SysMenu[] = this.sysMenuRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
for (const menu of menuList) { for (const menu of menuList) {
const langMenuKey: string = "dict_menu_" + menu.appType + "." + menu.getMenuKey(); const langMenuKey: string = "dict_menu_" + menu.appType + "." + menu.menuKey;
const langMenuName: string = LanguageUtils.get(langMenuKey); const langMenuName: string = LanguageUtils.get(langMenuKey);
if (langMenuKey !== langMenuName) { if (langMenuKey !== langMenuName) {
menu.setMenuName(langMenuName); menu.menuName = langMenuName;
} }
} }
return menuList; return menuList;

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

@@ -21,12 +21,12 @@ export class SysNoticeLogServiceImplService {
any /* TODO: QueryWrapper<SysNoticeLog> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<SysNoticeLog> */ queryWrapper = new QueryWrapper();
queryWrapper.eq("site_id", this.requestContext.siteId); queryWrapper.eq("site_id", this.requestContext.siteId);
if (CommonUtils.isNotEmpty(searchParam.getReceiver())) queryWrapper.eq("receiver", searchParam.getReceiver()); if (CommonUtils.isNotEmpty(searchParam.receiver)) queryWrapper.eq("receiver", searchParam.receiver);
if (CommonUtils.isNotEmpty(searchParam.key)) queryWrapper.eq("`key`", searchParam.key); if (CommonUtils.isNotEmpty(searchParam.key)) queryWrapper.eq("`key`", searchParam.key);
if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper, "create_time", searchParam.createTime); if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper, "create_time", searchParam.createTime);
queryWrapper.orderByDesc("id"); queryWrapper.orderByDesc("id");
const noticeEnum: Record<String, NoticeEnumListVo> = NoticeEnum.getNotice(); const noticeEnum: Record<String, NoticeEnumListVo> = NoticeEnum.notice;
[SysNoticeLog[], number] iPage = this.sysNoticeLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); [SysNoticeLog[], number] iPage = this.sysNoticeLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
const list: SysNoticeLogListVo[] = []; const list: SysNoticeLogListVo[] = [];

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

@@ -53,16 +53,16 @@ export class SysNoticeServiceImplService {
const model: SysNotice = new SysNotice(); const model: SysNotice = new SysNotice();
model.siteId = addParam.siteId; model.siteId = addParam.siteId;
model.key = addParam.key; model.key = addParam.key;
model.setSmsContent(addParam.getSmsContent()); model.smsContent = addParam.smsContent;
model.setIsWechat(addParam.getIsWechat()); model.isWechat = addParam.isWechat;
model.setIsWeapp(addParam.getIsWeapp()); model.isWeapp = addParam.isWeapp;
model.setIsSms(addParam.getIsSms()); model.isSms = addParam.isSms;
model.setWechatTemplateId(addParam.getWechatTemplateId()); model.wechatTemplateId = addParam.wechatTemplateId;
model.setWeappTemplateId(addParam.getWeappTemplateId()); model.weappTemplateId = addParam.weappTemplateId;
model.setSmsId(addParam.getSmsId()); model.smsId = addParam.smsId;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
model.setWechatFirst(addParam.getWechatFirst()); model.wechatFirst = addParam.wechatFirst;
model.setWechatRemark(addParam.getWechatRemark()); model.wechatRemark = addParam.wechatRemark;
this.sysNoticeRepository.save(model); this.sysNoticeRepository.save(model);
} }
@@ -77,15 +77,15 @@ export class SysNoticeServiceImplService {
model.id = id; model.id = id;
model.siteId = editParam.siteId; model.siteId = editParam.siteId;
model.key = editParam.key; model.key = editParam.key;
model.setSmsContent(editParam.getSmsContent()); model.smsContent = editParam.smsContent;
model.setIsWechat(editParam.getIsWechat()); model.isWechat = editParam.isWechat;
model.setIsWeapp(editParam.getIsWeapp()); model.isWeapp = editParam.isWeapp;
model.setIsSms(editParam.getIsSms()); model.isSms = editParam.isSms;
model.setWechatTemplateId(editParam.getWechatTemplateId()); model.wechatTemplateId = editParam.wechatTemplateId;
model.setWeappTemplateId(editParam.getWeappTemplateId()); model.weappTemplateId = editParam.weappTemplateId;
model.setSmsId(editParam.getSmsId()); model.smsId = editParam.smsId;
model.setWechatFirst(editParam.getWechatFirst()); model.wechatFirst = editParam.wechatFirst;
model.setWechatRemark(editParam.getWechatRemark()); model.wechatRemark = editParam.wechatRemark;
sysNoticeMapper.updateById(model); sysNoticeMapper.updateById(model);
} }

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

@@ -22,20 +22,20 @@ export class SysNoticeSmsLogServiceImplService {
any /* TODO: QueryWrapper<SysNoticeSmsLog> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<SysNoticeSmsLog> */ queryWrapper = new QueryWrapper();
queryWrapper.eq("site_id", this.requestContext.siteId); queryWrapper.eq("site_id", this.requestContext.siteId);
if (CommonUtils.isNotEmpty(searchParam.key)) queryWrapper.eq("`key`", searchParam.key); if (CommonUtils.isNotEmpty(searchParam.key)) queryWrapper.eq("`key`", searchParam.key);
if (CommonUtils.isNotEmpty(searchParam.getSmsType())) queryWrapper.eq("sms_type", searchParam.getSmsType()); if (CommonUtils.isNotEmpty(searchParam.smsType)) queryWrapper.eq("sms_type", searchParam.smsType);
if (CommonUtils.isNotEmpty(searchParam.getMobile())) queryWrapper.eq("mobile", searchParam.getMobile()); if (CommonUtils.isNotEmpty(searchParam.mobile)) queryWrapper.eq("mobile", searchParam.mobile);
if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper,"create_time" ,searchParam.createTime); if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper,"create_time" ,searchParam.createTime);
queryWrapper.orderByDesc("id"); queryWrapper.orderByDesc("id");
const smsTypeEnum: Record<string, any> = SmsTypeEnum.type; const smsTypeEnum: Record<string, any> = SmsTypeEnum.type;
const notice: Record<String, NoticeEnumListVo> = NoticeEnum.getNotice(); const notice: Record<String, NoticeEnumListVo> = NoticeEnum.notice;
[SysNoticeSmsLog[], number] iPage = this.sysNoticeSmsLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); [SysNoticeSmsLog[], number] iPage = this.sysNoticeSmsLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
const list: SysNoticeSmsLogListVo[] = []; const list: SysNoticeSmsLogListVo[] = [];
for (const item of iPageRecords) { for (const item of iPageRecords) {
const vo: SysNoticeSmsLogListVo = new SysNoticeSmsLogListVo(); const vo: SysNoticeSmsLogListVo = new SysNoticeSmsLogListVo();
Object.assign(vo, item); Object.assign(vo, item);
vo.setSmsTypeName(smsTypeEnum.getByPath(item.getSmsType() + ".name", String.class)); vo.smsTypeName = smsTypeEnum.getByPath(item.smsType + ".name", String.class);
vo.name = ObjectUtil.defaultIfNull(notice.get(item.key.getName(), "")); vo.name = ObjectUtil.defaultIfNull(notice.get(item.key.getName(), ""));
list.push(vo); list.push(vo);
} }

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

@@ -80,9 +80,9 @@ export class SysPosterServiceImplService {
* add * add
*/ */
async add(addParam: SysPosterParam): Promise<any> { async add(addParam: SysPosterParam): Promise<any> {
if (addParam.getIsDefault() === 1) { if (addParam.isDefault === 1) {
const update: UpdateWrapper = new UpdateWrapper(); const update: UpdateWrapper = new UpdateWrapper();
update.setSql("is_default = 0"); update.sql = "is_default = 0";
update.eq("type", addParam.type); update.eq("type", addParam.type);
update.eq("is_default", 1); update.eq("is_default", 1);
update.eq("site_id", this.requestContext.siteId); update.eq("site_id", this.requestContext.siteId);
@@ -104,9 +104,9 @@ export class SysPosterServiceImplService {
if (!model) throw new BadRequestException("海报不存在!"); if (!model) throw new BadRequestException("海报不存在!");
if (editParam.getIsDefault() === 1) { if (editParam.isDefault === 1) {
const update: UpdateWrapper = new UpdateWrapper(); const update: UpdateWrapper = new UpdateWrapper();
update.setSql("is_default = 0"); update.sql = "is_default = 0";
update.eq("type", editParam.type); update.eq("type", editParam.type);
update.eq("is_default", 1); update.eq("is_default", 1);
update.eq("site_id", this.requestContext.siteId); update.eq("site_id", this.requestContext.siteId);
@@ -144,12 +144,12 @@ export class SysPosterServiceImplService {
Object.assign(vo, poster); Object.assign(vo, poster);
} }
vo.setPosterType(PosterTypeEnum.getType(vo.type)); vo.posterType = PosterTypeEnum.getType(vo.type);
if (CommonUtils.isNotEmpty(vo.getPosterType()) && CommonUtils.isEmpty(vo.getAddon())) vo.setAddon(vo.getPosterType().getStr("addon", "")); if (CommonUtils.isNotEmpty(vo.posterType) && CommonUtils.isEmpty(vo.addon)) vo.addon = vo.posterType.getStr("addon", "");
const components: Record<string, any> = JsonModuleLoader.build().mergeResultElement("poster/components.json"); const components: Record<string, any> = JsonModuleLoader.build().mergeResultElement("poster/components.json");
vo.setComponent(new Record<string, any>()); vo.component = new Record<string, any>();
for (const key of components.keySet()) { for (const key of components.keySet()) {
const item: Record<string, any> = components.getRecord<string, any>(key); const item: Record<string, any> = components.getRecord<string, any>(key);
if (item.getRecord<string, any>("list") == null || item.getRecord<string, any>("list").keySet().size() == 0) { if (item.getRecord<string, any>("list") == null || item.getRecord<string, any>("list").keySet().size() == 0) {
@@ -159,7 +159,7 @@ export class SysPosterServiceImplService {
if (key !== vo.type && support.length > 0 && !support.includes(vo.type)) { if (key !== vo.type && support.length > 0 && !support.includes(vo.type)) {
continue; continue;
} }
vo.getComponent().put(key, item); vo.component.put(key, item);
} }
return vo; return vo;
@@ -169,7 +169,7 @@ export class SysPosterServiceImplService {
* template * template
*/ */
async template(param: SysPosterTemplateSearchParam): Promise<any> { async template(param: SysPosterTemplateSearchParam): Promise<any> {
return this.corePosterService.template(param.getAddon(), param.type); return this.corePosterService.template(param.addon, param.type);
} }
/** /**
@@ -191,14 +191,14 @@ export class SysPosterServiceImplService {
if (!model) throw new BadRequestException("海报不存在!"); if (!model) throw new BadRequestException("海报不存在!");
const update: UpdateWrapper = new UpdateWrapper(); const update: UpdateWrapper = new UpdateWrapper();
update.setSql("is_default = 0"); update.sql = "is_default = 0";
update.eq("type", model.type); update.eq("type", model.type);
update.eq("is_default", 1); update.eq("is_default", 1);
update.eq("site_id", this.requestContext.siteId); update.eq("site_id", this.requestContext.siteId);
this.sysPosterRepository.save(null, update); this.sysPosterRepository.save(null, update);
const updateModel: SysPoster = new SysPoster(); const updateModel: SysPoster = new SysPoster();
updateModel.setIsDefault(1); updateModel.isDefault = 1;
updateModel.id = id; updateModel.id = id;
sysPosterMapper.updateById(updateModel); sysPosterMapper.updateById(updateModel);
} }
@@ -211,11 +211,11 @@ export class SysPosterServiceImplService {
getPosterParam.id = param.id; getPosterParam.id = param.id;
getPosterParam.type = param.type; getPosterParam.type = param.type;
getPosterParam.siteId = this.requestContext.siteId; getPosterParam.siteId = this.requestContext.siteId;
getPosterParam.setChannel(ObjectUtil.defaultIfNull(param.getChannel(), "h5")); getPosterParam.channel = ObjectUtil.defaultIfNull(param.channel, "h5");
const posterParam: Record<String, Object> = {}; const posterParam: Record<String, Object> = {};
posterParam.put("mode", "preview"); posterParam.put("mode", "preview");
getPosterParam.setParam(posterParam); getPosterParam.param = posterParam;
getPosterParam.setIsThrowException(true); getPosterParam.isThrowException = true;
return this.corePosterService.get(getPosterParam); return this.corePosterService.get(getPosterParam);
} }
} }

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

@@ -29,8 +29,8 @@ export class SysPrinterServiceImplService {
queryWrapper.eq("site_id", this.requestContext.siteId) queryWrapper.eq("site_id", this.requestContext.siteId)
.orderByDesc("create_time"); .orderByDesc("create_time");
if (CommonUtils.isNotEmpty(searchParam.getPrinterName())) { if (CommonUtils.isNotEmpty(searchParam.printerName)) {
queryWrapper.like("printer_name", searchParam.getPrinterName()); queryWrapper.like("printer_name", searchParam.printerName);
} }
[SysPrinter[], number] iPage = this.sysPrinterRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); [SysPrinter[], number] iPage = this.sysPrinterRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
@@ -38,8 +38,8 @@ export class SysPrinterServiceImplService {
for (const item of iPageRecords) { for (const item of iPageRecords) {
const vo: SysPrinterListVo = new SysPrinterListVo(); const vo: SysPrinterListVo = new SysPrinterListVo();
Object.assign(vo, item); Object.assign(vo, item);
vo.setBrandName(SysPrinterBrandEnum.getNameByBrand(item.getBrand())); vo.brandName = SysPrinterBrandEnum.getNameByBrand(item.brand);
vo.setTrigger(JSONArray.parseArray(item.getTrigger(), String.class)); vo.trigger = JSONArray.parseArray(item.trigger, String.class);
list.push(vo); list.push(vo);
} }
return PageResult.build(page, limit, iPageTotal).setData(list); return PageResult.build(page, limit, iPageTotal).setData(list);
@@ -55,17 +55,17 @@ export class SysPrinterServiceImplService {
.orderByDesc("create_time") .orderByDesc("create_time")
.select("printer_id, apikey, brand, create_time, open_id, print_width, printer_code, printer_key, printer_name, site_id, status, template_type, 'trigger', update_time, value"); .select("printer_id, apikey, brand, create_time, open_id, print_width, printer_code, printer_key, printer_name, site_id, status, template_type, 'trigger', update_time, value");
if (CommonUtils.isNotEmpty(param.getPrinterName())) { if (CommonUtils.isNotEmpty(param.printerName)) {
queryWrapper.like("printer_name", param.getPrinterName()); queryWrapper.like("printer_name", param.printerName);
} }
const list: SysPrinterListVo[] = []; const list: SysPrinterListVo[] = [];
for (const item of this.sysPrinterRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) { for (const item of this.sysPrinterRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) {
const vo: SysPrinterListVo = new SysPrinterListVo(); const vo: SysPrinterListVo = new SysPrinterListVo();
Object.assign(vo, item); Object.assign(vo, item);
vo.setBrandName(SysPrinterBrandEnum.getNameByBrand(item.getBrand())); vo.brandName = SysPrinterBrandEnum.getNameByBrand(item.brand);
vo.value = JSON.parseObject(item.value); vo.value = JSON.parseObject(item.value);
vo.setTrigger(JSONArray.parseArray(item.getTrigger(), String.class)); vo.trigger = JSONArray.parseArray(item.trigger, String.class);
list.push(vo); list.push(vo);
} }
@@ -95,12 +95,12 @@ export class SysPrinterServiceImplService {
Object.assign(model, addParam); Object.assign(model, addParam);
model.siteId = this.requestContext.siteId; model.siteId = this.requestContext.siteId;
model.value = JSON.toJSONString(addParam.value); model.value = JSON.toJSONString(addParam.value);
model.setTemplateType(addParam.getTemplateType().get(0)); model.templateType = addParam.templateType.get(0);
model.setTrigger(JSON.toJSONString(addParam.getTrigger())); model.trigger = JSON.toJSONString(addParam.trigger);
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
this.sysPrinterRepository.save(model); this.sysPrinterRepository.save(model);
if (addParam.getBrand() === SysPrinterBrandEnum.YI_LIAN_YUN.getBrand()) { if (addParam.brand === SysPrinterBrandEnum.YI_LIAN_YUN.brand) {
const addPrinterYlyParam: SysPrinterAddPrinterYlyParam = new SysPrinterAddPrinterYlyParam(); const addPrinterYlyParam: SysPrinterAddPrinterYlyParam = new SysPrinterAddPrinterYlyParam();
Object.assign(addPrinterYlyParam, addParam); Object.assign(addPrinterYlyParam, addParam);
this.corePrinterService.addPrinterYly(addPrinterYlyParam); this.corePrinterService.addPrinterYly(addPrinterYlyParam);
@@ -117,12 +117,12 @@ export class SysPrinterServiceImplService {
if (!model) throw new BadRequestException("小票打印机不存在"); if (!model) throw new BadRequestException("小票打印机不存在");
Object.assign(model, editParam); Object.assign(model, editParam);
model.value = JSON.toJSONString(editParam.value); model.value = JSON.toJSONString(editParam.value);
model.setTemplateType(editParam.getTemplateType().get(0)); model.templateType = editParam.templateType.get(0);
model.setTrigger(JSON.toJSONString(editParam.getTrigger())); model.trigger = JSON.toJSONString(editParam.trigger);
model.updateTime = Date.now( / 1000); model.updateTime = Date.now( / 1000);
sysPrinterMapper.updateById(model); sysPrinterMapper.updateById(model);
if (editParam.getBrand() === SysPrinterBrandEnum.YI_LIAN_YUN.getBrand()) { if (editParam.brand === SysPrinterBrandEnum.YI_LIAN_YUN.brand) {
const addPrinterYlyParam: SysPrinterAddPrinterYlyParam = new SysPrinterAddPrinterYlyParam(); const addPrinterYlyParam: SysPrinterAddPrinterYlyParam = new SysPrinterAddPrinterYlyParam();
Object.assign(addPrinterYlyParam, editParam); Object.assign(addPrinterYlyParam, editParam);
this.corePrinterService.addPrinterYly(addPrinterYlyParam); this.corePrinterService.addPrinterYly(addPrinterYlyParam);
@@ -152,7 +152,7 @@ export class SysPrinterServiceImplService {
this.sysPrinterRepository.delete(id); this.sysPrinterRepository.delete(id);
if (model.getBrand() === SysPrinterBrandEnum.YI_LIAN_YUN.getBrand()) { if (model.brand === SysPrinterBrandEnum.YI_LIAN_YUN.brand) {
this.corePrinterService.deletePrinterYly(model); this.corePrinterService.deletePrinterYly(model);
} }
} }
@@ -163,11 +163,11 @@ export class SysPrinterServiceImplService {
async getBrand(): Promise<any> { async getBrand(): Promise<any> {
const jsonObject: Record<string, any> = new Record<string, any>(); const jsonObject: Record<string, any> = new Record<string, any>();
for (const value of SysPrinterBrandEnum.values()) { for (const value of SysPrinterBrandEnum.values()) {
if (CommonUtils.isEmpty(value.getBrand())) { if (CommonUtils.isEmpty(value.brand)) {
continue; continue;
} }
jsonObject.put(value.getBrand(), path.basename(value)); jsonObject.put(value.brand, path.basename(value));
} }
return jsonObject; return jsonObject;
} }
@@ -197,7 +197,7 @@ export class SysPrinterServiceImplService {
throw new Error("打印机不存在"); throw new Error("打印机不存在");
} }
if (model.getBrand() === SysPrinterBrandEnum.YI_LIAN_YUN.getBrand()) { if (model.brand === SysPrinterBrandEnum.YI_LIAN_YUN.brand) {
testYlyPrint(model); testYlyPrint(model);
} }
} }

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

@@ -25,14 +25,14 @@ export class SysPrinterTemplateServiceImplService {
queryWrapper.eq("site_id", this.requestContext.siteId) queryWrapper.eq("site_id", this.requestContext.siteId)
.orderByDesc("create_time"); .orderByDesc("create_time");
if (CommonUtils.isNotEmpty(searchParam.getTemplateId())) { if (CommonUtils.isNotEmpty(searchParam.templateId)) {
queryWrapper.eq("template_id", searchParam.getTemplateId()); queryWrapper.eq("template_id", searchParam.templateId);
} }
if (CommonUtils.isNotEmpty(searchParam.getTemplateName())) { if (CommonUtils.isNotEmpty(searchParam.templateName)) {
queryWrapper.like("template_name", searchParam.getTemplateName()); queryWrapper.like("template_name", searchParam.templateName);
} }
if (CommonUtils.isNotEmpty(searchParam.getTemplateType())) { if (CommonUtils.isNotEmpty(searchParam.templateType)) {
queryWrapper.eq("template_type", searchParam.getTemplateType()); queryWrapper.eq("template_type", searchParam.templateType);
} }
[SysPrinterTemplate[], number] iPage = this.sysPrinterTemplateRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); [SysPrinterTemplate[], number] iPage = this.sysPrinterTemplateRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
@@ -40,7 +40,7 @@ export class SysPrinterTemplateServiceImplService {
for (const item of iPageRecords) { for (const item of iPageRecords) {
const vo: SysPrinterTemplateListVo = new SysPrinterTemplateListVo(); const vo: SysPrinterTemplateListVo = new SysPrinterTemplateListVo();
Object.assign(vo, item); Object.assign(vo, item);
vo.setTemplateTypeName(SysPrinterTypeEnum.getTypeName(item.getTemplateType())); vo.templateTypeName = SysPrinterTypeEnum.getTypeName(item.templateType);
vo.value = JSON.parseObject(item.value); vo.value = JSON.parseObject(item.value);
vo.createTime = DateUtils.timestampToString(item.createTime); vo.createTime = DateUtils.timestampToString(item.createTime);
list.push(vo); list.push(vo);
@@ -57,21 +57,21 @@ export class SysPrinterTemplateServiceImplService {
queryWrapper.eq("site_id", this.requestContext.siteId) queryWrapper.eq("site_id", this.requestContext.siteId)
.orderByDesc("create_time"); .orderByDesc("create_time");
if (CommonUtils.isNotEmpty(searchParam.getTemplateId())) { if (CommonUtils.isNotEmpty(searchParam.templateId)) {
queryWrapper.eq("template_id", searchParam.getTemplateId()); queryWrapper.eq("template_id", searchParam.templateId);
} }
if (CommonUtils.isNotEmpty(searchParam.getTemplateName())) { if (CommonUtils.isNotEmpty(searchParam.templateName)) {
queryWrapper.like("template_name", searchParam.getTemplateName()); queryWrapper.like("template_name", searchParam.templateName);
} }
if (CommonUtils.isNotEmpty(searchParam.getTemplateType())) { if (CommonUtils.isNotEmpty(searchParam.templateType)) {
queryWrapper.eq("template_type", searchParam.getTemplateType()); queryWrapper.eq("template_type", searchParam.templateType);
} }
const voList: SysPrinterTemplateListVo[] = []; const voList: SysPrinterTemplateListVo[] = [];
for (const item of this.sysPrinterTemplateRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) { for (const item of this.sysPrinterTemplateRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) {
const vo: SysPrinterTemplateListVo = new SysPrinterTemplateListVo(); const vo: SysPrinterTemplateListVo = new SysPrinterTemplateListVo();
Object.assign(vo, item); Object.assign(vo, item);
vo.setTemplateTypeName(SysPrinterTypeEnum.getTypeName(item.getTemplateType())); vo.templateTypeName = SysPrinterTypeEnum.getTypeName(item.templateType);
vo.value = JSON.parseObject(item.value); vo.value = JSON.parseObject(item.value);
vo.createTime = DateUtils.timestampToString(item.createTime); vo.createTime = DateUtils.timestampToString(item.createTime);
voList.push(vo); voList.push(vo);
@@ -128,7 +128,7 @@ export class SysPrinterTemplateServiceImplService {
Lambdaany /* TODO: QueryWrapper<SysPrinter> */ printerLambdaQueryWrapper = new LambdaQueryWrapper(); Lambdaany /* TODO: QueryWrapper<SysPrinter> */ printerLambdaQueryWrapper = new LambdaQueryWrapper();
printerLambdaQueryWrapper.eq(SysPrinter::getSiteId, this.requestContext.siteId) printerLambdaQueryWrapper.eq(SysPrinter::getSiteId, this.requestContext.siteId)
.like(SysPrinter::getTemplateType, template.getTemplateType()); .like(SysPrinter::getTemplateType, template.templateType);
const printers: SysPrinter[] = this.sysPrinterRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); const printers: SysPrinter[] = this.sysPrinterRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
Optional<SysPrinter> illegalPrinter = printers Optional<SysPrinter> illegalPrinter = printers

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

@@ -24,8 +24,8 @@ export class SysRoleServiceImplService {
any /* TODO: QueryWrapper<SysRole> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<SysRole> */ queryWrapper = new QueryWrapper();
queryWrapper.orderByDesc("role_id"); queryWrapper.orderByDesc("role_id");
queryWrapper.eq("site_id", this.requestContext.siteId); queryWrapper.eq("site_id", this.requestContext.siteId);
if(ObjectUtil.isNotNull(searchParam.getRoleName()) && CommonUtils.isNotEmpty(searchParam.getRoleName())){ if(ObjectUtil.isNotNull(searchParam.roleName) && CommonUtils.isNotEmpty(searchParam.roleName)){
queryWrapper.like("role_name", searchParam.getRoleName()); queryWrapper.like("role_name", searchParam.roleName);
} }
[SysRole[], number] iPage = this.sysRoleRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); [SysRole[], number] iPage = this.sysRoleRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
const list: SysRoleListVo[] = []; const list: SysRoleListVo[] = [];
@@ -56,7 +56,7 @@ export class SysRoleServiceImplService {
*/ */
async add(addParam: SysRoleParam): Promise<any> { async add(addParam: SysRoleParam): Promise<any> {
const isExist: SysRole = this.sysRoleRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) const isExist: SysRole = this.sysRoleRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
.eq("role_name", addParam.getRoleName()) .eq("role_name", addParam.roleName)
.eq("site_id", this.requestContext.siteId) .eq("site_id", this.requestContext.siteId)
.last("limit 1") .last("limit 1")
); );
@@ -64,8 +64,8 @@ export class SysRoleServiceImplService {
const model: SysRole = new SysRole(); const model: SysRole = new SysRole();
model.siteId = this.requestContext.siteId; model.siteId = this.requestContext.siteId;
model.setRoleName(addParam.getRoleName()); model.roleName = addParam.roleName;
model.setRules(JSONUtil.toJsonStr(addParam.getRules())); model.rules = JSONUtil.toJsonStr(addParam.rules);
model.status = addParam.status; model.status = addParam.status;
model.createTime = DateUtils.currTime(); model.createTime = DateUtils.currTime();
model.updateTime = DateUtils.currTime(); model.updateTime = DateUtils.currTime();
@@ -77,7 +77,7 @@ export class SysRoleServiceImplService {
*/ */
async edit(roleId: number, editParam: SysRoleParam): Promise<any> { async edit(roleId: number, editParam: SysRoleParam): Promise<any> {
const isExist: SysRole = this.sysRoleRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) const isExist: SysRole = this.sysRoleRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
.eq("role_name", editParam.getRoleName()) .eq("role_name", editParam.roleName)
.eq("site_id", this.requestContext.siteId) .eq("site_id", this.requestContext.siteId)
.ne("role_id", roleId) .ne("role_id", roleId)
.last("limit 1") .last("limit 1")
@@ -89,8 +89,8 @@ export class SysRoleServiceImplService {
if (!model) throw new BadRequestException("数据不存在!"); if (!model) throw new BadRequestException("数据不存在!");
model.siteId = this.requestContext.siteId; model.siteId = this.requestContext.siteId;
model.setRoleName(editParam.getRoleName()); model.roleName = editParam.roleName;
model.setRules(JSONUtil.toJsonStr(editParam.getRules())); model.rules = JSONUtil.toJsonStr(editParam.rules);
model.status = editParam.status; model.status = editParam.status;
model.updateTime = DateUtils.currTime(); model.updateTime = DateUtils.currTime();
sysRoleMapper.updateById(model); sysRoleMapper.updateById(model);
@@ -116,7 +116,7 @@ export class SysRoleServiceImplService {
*/ */
async getMenuIdsByRoleIds(siteId: number, roleIds: List<String>): Promise<any> { async getMenuIdsByRoleIds(siteId: number, roleIds: List<String>): Promise<any> {
const queryWrapper: QueryWrapper = /* TODO: any /* TODO: QueryWrapper<SysRole> */需改写为TypeORM的where条件对象 */; const queryWrapper: QueryWrapper = /* TODO: any /* TODO: QueryWrapper<SysRole> */需改写为TypeORM的where条件对象 */;
queryWrapper.eq("status", RoleStatusEnum.ON.getCode()); queryWrapper.eq("status", RoleStatusEnum.ON.code);
// 判断roleIds不能为空 // 判断roleIds不能为空
if(ObjectUtil.isNotNull(roleIds) && roleIds.length>0){ if(ObjectUtil.isNotNull(roleIds) && roleIds.length>0){
queryWrapper.in("role_id", roleIds); queryWrapper.in("role_id", roleIds);
@@ -124,7 +124,7 @@ export class SysRoleServiceImplService {
const roleList: SysRole[] = this.sysRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); const roleList: SysRole[] = this.sysRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
const roleMenuJson: JSONArray = new JSONArray(); const roleMenuJson: JSONArray = new JSONArray();
for (const sysRole of roleList) { for (const sysRole of roleList) {
const ruleJson: JSONArray = JSONUtil.parseArray(sysRole.getRules()); const ruleJson: JSONArray = JSONUtil.parseArray(sysRole.rules);
roleMenuJson.addAll(ruleJson); roleMenuJson.addAll(ruleJson);
} }
//去重 //去重
@@ -155,23 +155,23 @@ export class SysRoleServiceImplService {
if (CommonUtils.isEmpty(sysUserRole)){ if (CommonUtils.isEmpty(sysUserRole)){
return List.of(); return List.of();
} }
isAdmin = sysUserRole.getIsAdmin() == 1 ? true : false; isAdmin = sysUserRole.isAdmin == 1 ? true : false;
} }
if (!isAdmin){ if (!isAdmin){
if (StringUtils.isNotEmpty(sysUserRole.getRoleIds()) && "[]".equals(sysUserRole.getRoleIds())){ if (StringUtils.isNotEmpty(sysUserRole.roleIds) && "[]".equals(sysUserRole.roleIds)){
const roleIdsStr: string = sysUserRole.getRoleIds().replaceAll("[\\[\\]\"]", ""); const roleIdsStr: string = sysUserRole.roleIds.replaceAll("[\\[\\]\"]", "");
const menuIdsByRoleIds: string[] = getMenuIdsByRoleIds(this.requestContext.siteId, Arrays.stream(roleIdsStr.split(","))); const menuIdsByRoleIds: string[] = getMenuIdsByRoleIds(this.requestContext.siteId, Arrays.stream(roleIdsStr.split(",")));
for (const sysRoleListVo of sysRoleListVoList) { for (const sysRoleListVo of sysRoleListVoList) {
const diff: string[] = new ArrayList<>(Collections.singleton(sysRoleListVo.getRules())); const diff: string[] = new ArrayList<>(Collections.singleton(sysRoleListVo.rules));
diff.removeAll(menuIdsByRoleIds); diff.removeAll(menuIdsByRoleIds);
if ((diff && diff.length > 0)){ if ((diff && diff.length > 0)){
sysRoleListVo.setDisabled(true); sysRoleListVo.disabled = true;
} }
} }
} }
} }
sysRoleListVoList.forEach(sysRoleListVo => sysRoleListVo.setRules(null)); sysRoleListVoList.forEach(sysRoleListVo => sysRoleListVo.rules = null);
return sysRoleListVoList; return sysRoleListVoList;
} }
} }

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

@@ -33,8 +33,8 @@ export class SysScheduleServiceImplService {
const providers: Record<String, IJobProvider> = applicationContext.getBeansOfType(IJobProvider.class); const providers: Record<String, IJobProvider> = applicationContext.getBeansOfType(IJobProvider.class);
log.info("Loaded job provider count: {}", providers.length); log.info("Loaded job provider count: {}", providers.length);
for (const provider of providers.values()) { for (const provider of providers.values()) {
log.info("Loaded job provider: {}", provider.getClass().getName()); log.info("Loaded job provider: {}", provider.class.getName());
const annotation: JobProvider = provider.getClass().getAnnotation(JobProvider.class); const annotation: JobProvider = provider.class.getAnnotation(JobProvider.class);
if (annotation != null) { if (annotation != null) {
// 使用注解的 key 作为 map 的键 // 使用注解的 key 作为 map 的键
jobProviderMap.put(annotation.key(), provider); jobProviderMap.put(annotation.key(), provider);
@@ -75,8 +75,8 @@ export class SysScheduleServiceImplService {
for (const sysSchedule of sysSchedulePageRecords) { for (const sysSchedule of sysSchedulePageRecords) {
const sysScheduleListVo: SysScheduleListVo = new SysScheduleListVo(); const sysScheduleListVo: SysScheduleListVo = new SysScheduleListVo();
Object.assign(sysScheduleListVo, sysSchedule); Object.assign(sysScheduleListVo, sysSchedule);
sysScheduleListVo.setTimeObject(sysSchedule.getTime()); sysScheduleListVo.timeObject = sysSchedule.time;
sysScheduleListVo.setCrontabContent(QuartzJobManager.convertCronContent(sysSchedule.getTime())); sysScheduleListVo.crontabContent = QuartzJobManager.convertCronContent(sysSchedule.time);
sysScheduleListVoList.push(sysScheduleListVo); sysScheduleListVoList.push(sysScheduleListVo);
} }
return PageResult.build(page, limit, sysSchedulePageTotal).setData(sysScheduleListVoList); return PageResult.build(page, limit, sysSchedulePageTotal).setData(sysScheduleListVoList);
@@ -129,11 +129,11 @@ export class SysScheduleServiceImplService {
// 新增一个任务 // 新增一个任务
const newSysSchedule: SysSchedule = new SysSchedule(); const newSysSchedule: SysSchedule = new SysSchedule();
Object.assign(newSysSchedule, sysScheduleParam); Object.assign(newSysSchedule, sysScheduleParam);
newSysSchedule.setTime(JSONUtil.toJsonStr(sysScheduleParam.getTime())); newSysSchedule.time = JSONUtil.toJsonStr(sysScheduleParam.time);
newSysSchedule.createTime = DateUtils.currTime(); newSysSchedule.createTime = DateUtils.currTime();
newSysSchedule.updateTime = DateUtils.currTime(); newSysSchedule.updateTime = DateUtils.currTime();
newSysSchedule.siteId = this.requestContext.siteId; newSysSchedule.siteId = this.requestContext.siteId;
newSysSchedule.setAddon(jobInfo.getSource()); newSysSchedule.addon = jobInfo.source;
const result: number = this.sysScheduleRepository.save(newSysSchedule); const result: number = this.sysScheduleRepository.save(newSysSchedule);
if (result > 0) { if (result > 0) {
if (newSysSchedule.status == 1) { if (newSysSchedule.status == 1) {
@@ -155,7 +155,7 @@ export class SysScheduleServiceImplService {
newSysSchedule.id = id; newSysSchedule.id = id;
newSysSchedule.siteId = this.requestContext.siteId; newSysSchedule.siteId = this.requestContext.siteId;
newSysSchedule.updateTime = DateUtils.currTime(); newSysSchedule.updateTime = DateUtils.currTime();
newSysSchedule.setTime(JSONUtil.toJsonStr(sysScheduleParam.getTime())); newSysSchedule.time = JSONUtil.toJsonStr(sysScheduleParam.time);
const result: number = sysScheduleMapper.updateById(newSysSchedule); const result: number = sysScheduleMapper.updateById(newSysSchedule);
if (result <= 0) { if (result <= 0) {
log.error("更新系统任务失败：id={}", id); log.error("更新系统任务失败：id={}", id);
@@ -191,9 +191,9 @@ export class SysScheduleServiceImplService {
const sysScheduleTemplateVo: SysScheduleTemplateVo = new SysScheduleTemplateVo(); const sysScheduleTemplateVo: SysScheduleTemplateVo = new SysScheduleTemplateVo();
sysScheduleTemplateVo.key = jobKey; sysScheduleTemplateVo.key = jobKey;
sysScheduleTemplateVo.name = path.basename(jobInfo); sysScheduleTemplateVo.name = path.basename(jobInfo);
sysScheduleTemplateVo.desc = jobInfo.getDescribe(); sysScheduleTemplateVo.desc = jobInfo.describe;
sysScheduleTemplateVo.setClazz(jobInfo.getJobClass()); sysScheduleTemplateVo.clazz = jobInfo.jobClass;
sysScheduleTemplateVo.setFunction(jobInfo.getJobClass()); sysScheduleTemplateVo.function = jobInfo.jobClass;
sysScheduleTemplateVoList.push(sysScheduleTemplateVo); sysScheduleTemplateVoList.push(sysScheduleTemplateVo);
} }
return sysScheduleTemplateVoList; return sysScheduleTemplateVoList;
@@ -225,13 +225,13 @@ export class SysScheduleServiceImplService {
const page: number = pageParam.page; const page: number = pageParam.page;
const limit: number = pageParam.limit; const limit: number = pageParam.limit;
Lambdaany /* TODO: QueryWrapper<SysScheduleLog> */ qw = new LambdaQueryWrapper(); Lambdaany /* TODO: QueryWrapper<SysScheduleLog> */ qw = new LambdaQueryWrapper();
qw.eq(CommonUtils.isNotEmpty(searchParam.getScheduleId()), SysScheduleLog::getScheduleId, searchParam.getScheduleId()); qw.eq(CommonUtils.isNotEmpty(searchParam.scheduleId), SysScheduleLog::getScheduleId, searchParam.scheduleId);
qw.eq(CommonUtils.isNotEmpty(searchParam.key), SysScheduleLog::getKey, searchParam.key); qw.eq(CommonUtils.isNotEmpty(searchParam.key), SysScheduleLog::getKey, searchParam.key);
if (CommonUtils.isNotEmpty(searchParam.status) && !"all".equals(searchParam.status)){ if (CommonUtils.isNotEmpty(searchParam.status) && !"all".equals(searchParam.status)){
qw.eq(SysScheduleLog::getStatus, searchParam.status); qw.eq(SysScheduleLog::getStatus, searchParam.status);
} }
if (CommonUtils.isNotEmpty(searchParam.getExecuteTime())) { if (CommonUtils.isNotEmpty(searchParam.executeTime)) {
QueryMapperUtils.buildByTime(qw, SysScheduleLog::getExecuteTime, searchParam.getExecuteTime()); QueryMapperUtils.buildByTime(qw, SysScheduleLog::getExecuteTime, searchParam.executeTime);
} }
any /* TODO: Page<SysScheduleLog> */ sysScheduleLogPage = this.sysScheduleLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), qw); any /* TODO: Page<SysScheduleLog> */ sysScheduleLogPage = this.sysScheduleLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), qw);
const result: SysScheduleLogListVo[] = []; const result: SysScheduleLogListVo[] = [];
@@ -248,10 +248,10 @@ export class SysScheduleServiceImplService {
*/ */
async addLog(log: SysScheduleLog): Promise<any> { async addLog(log: SysScheduleLog): Promise<any> {
const sysSchedule: SysSchedule = this.sysScheduleRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) const sysSchedule: SysSchedule = this.sysScheduleRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
.eq(SysSchedule::getKey, log.key).eq(SysSchedule::getAddon, log.getAddon())); .eq(SysSchedule::getKey, log.key).eq(SysSchedule::getAddon, log.addon));
if (sysSchedule == null) return; if (sysSchedule == null) return;
log.setScheduleId(sysSchedule.id); log.scheduleId = sysSchedule.id;
log.setExecuteTime(DateUtils.currTime()); log.executeTime = DateUtils.currTime();
this.sysScheduleLogRepository.save(log); this.sysScheduleLogRepository.save(log);
} }
@@ -263,7 +263,7 @@ export class SysScheduleServiceImplService {
if (sysSchedule == null) { if (sysSchedule == null) {
throw new BadRequestException("计划任务不存在"); throw new BadRequestException("计划任务不存在");
} }
const basePackage: string = String.format("com.niu.%s.job", sysSchedule.getAddon()); const basePackage: string = String.format("com.niu.%s.job", sysSchedule.addon);
const classPath: string = QuartzJobManager.getClassPath(basePackage, sysSchedule.key); const classPath: string = QuartzJobManager.getClassPath(basePackage, sysSchedule.key);
const jobKey: string = sysSchedule.key; const jobKey: string = sysSchedule.key;
try { try {
@@ -276,7 +276,7 @@ export class SysScheduleServiceImplService {
} }
// 实例化任务 // 实例化任务
const job: IJobProvider = (IJobProvider) jobClass.getDeclaredConstructor().newInstance(); const job: IJobProvider = (IJobProvider) jobClass.declaredConstructor.newInstance();
// 执行任务 // 执行任务
job.exec(null); job.exec(null);
@@ -286,7 +286,7 @@ export class SysScheduleServiceImplService {
addLog(SysScheduleLog.builder() addLog(SysScheduleLog.builder()
.key(jobKey) .key(jobKey)
.name(path.basename(sysSchedule)) .name(path.basename(sysSchedule))
.addon(sysSchedule.getAddon()) .addon(sysSchedule.addon)
.className(classPath) .className(classPath)
.status("success") .status("success")
.executeResult(result) .executeResult(result)
@@ -296,11 +296,11 @@ export class SysScheduleServiceImplService {
} catch (e) { } catch (e) {
// 获取任务名称（即使在异常情况下也尝试获取） // 获取任务名称（即使在异常情况下也尝试获取）
const errorMsg: string = "计划任务：" + path.basename(sysSchedule) + "发生错误, 错误原因：" + e.message + const errorMsg: string = "计划任务：" + path.basename(sysSchedule) + "发生错误, 错误原因：" + e.message +
" at " + e.getStackTrace()[0].toString(); " at " + e.stackTrace[0].toString();
addLog(SysScheduleLog.builder() addLog(SysScheduleLog.builder()
.key(jobKey) .key(jobKey)
.name(path.basename(sysSchedule)) .name(path.basename(sysSchedule))
.addon(sysSchedule.getAddon()) .addon(sysSchedule.addon)
.className(classPath) .className(classPath)
.status("error") .status("error")
.executeResult(errorMsg) .executeResult(errorMsg)

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

@@ -34,17 +34,17 @@ export class SysUpgradeRecordsServiceImplService {
const vo: SysUpgradeRecordsListVo = new SysUpgradeRecordsListVo(); const vo: SysUpgradeRecordsListVo = new SysUpgradeRecordsListVo();
Object.assign(vo, item); Object.assign(vo, item);
vo.createTime = DateUtils.timestampToString(item.createTime); vo.createTime = DateUtils.timestampToString(item.createTime);
vo.setCompleteTime(DateUtils.timestampToString(item.getCompleteTime())); vo.completeTime = DateUtils.timestampToString(item.completeTime);
vo.setStatusName(UpgradeRecordStatusEnum.getNameByStatus(vo.status)); vo.statusName = UpgradeRecordStatusEnum.getNameByStatus(vo.status);
//判断为数组或者对象或者字符串 //判断为数组或者对象或者字符串
const value: string = item.getContent(); const value: string = item.content;
if (!StrUtil.isEmpty(value)) { if (!StrUtil.isEmpty(value)) {
if (value.startsWith("[")) { if (value.startsWith("[")) {
vo.setContent(JSON.parseArray(value)); vo.content = JSON.parseArray(value);
} else if (value.startsWith("{")) { } else if (value.startsWith("{")) {
vo.setContent(JSON.parseObject(value)); vo.content = JSON.parseObject(value);
} else { } else {
vo.setContent(value); vo.content = value;
} }
} }
list.push(vo); list.push(vo);
@@ -77,11 +77,11 @@ export class SysUpgradeRecordsServiceImplService {
public void del(SysUpgradeRecordsDelParam delParam) { public void del(SysUpgradeRecordsDelParam delParam) {
const queryWrapper: QueryWrapper = /* TODO: any /* TODO: QueryWrapper<SysUpgradeRecords> */需改写为TypeORM的where条件对象 */; const queryWrapper: QueryWrapper = /* TODO: any /* TODO: QueryWrapper<SysUpgradeRecords> */需改写为TypeORM的where条件对象 */;
if (delParam.getIds().getClass().getName().startsWith("[")) { if (delParam.ids.getClass().getName().startsWith("[")) {
const stringIds: string[] = (String[]) delParam.getIds(); const stringIds: string[] = (String[]) delParam.ids;
queryWrapper.in("id", stringIds); queryWrapper.in("id", stringIds);
} else { } else {
queryWrapper.eq("id", delParam.getIds()); queryWrapper.eq("id", delParam.ids);
} }
this.sysUpgradeRecordsRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ }); this.sysUpgradeRecordsRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ });
} }

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

@@ -22,11 +22,11 @@ export class SysUserLogServiceImplService {
any /* TODO: QueryWrapper<SysUserLog> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<SysUserLog> */ queryWrapper = new QueryWrapper();
queryWrapper.eq("site_id", this.requestContext.siteId); queryWrapper.eq("site_id", this.requestContext.siteId);
queryWrapper.orderByDesc("id"); queryWrapper.orderByDesc("id");
if(ObjectUtil.isNotNull(searchParam.getUsername()) && CommonUtils.isNotEmpty(searchParam.getUsername())){ if(ObjectUtil.isNotNull(searchParam.username) && CommonUtils.isNotEmpty(searchParam.username)){
queryWrapper.like("username", searchParam.getUsername()); queryWrapper.like("username", searchParam.username);
} }
if(ObjectUtil.isNotNull(searchParam.getIp()) && CommonUtils.isNotEmpty(searchParam.getIp())){ if(ObjectUtil.isNotNull(searchParam.ip) && CommonUtils.isNotEmpty(searchParam.ip)){
queryWrapper.like("ip", searchParam.getIp()); queryWrapper.like("ip", searchParam.ip);
} }
if(ObjectUtil.isNotNull(searchParam.url) && CommonUtils.isNotEmpty(searchParam.url)){ if(ObjectUtil.isNotNull(searchParam.url) && CommonUtils.isNotEmpty(searchParam.url)){

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

@@ -29,8 +29,8 @@ export class SysUserRoleServiceImplService {
.leftJoin("?_sys_user nsu ON nsur.uid = nsu.uid".replace("?_", this.appConfig.tablePrefix)); .leftJoin("?_sys_user nsu ON nsur.uid = nsu.uid".replace("?_", this.appConfig.tablePrefix));
//查询条件判断组装 //查询条件判断组装
if (CommonUtils.isNotEmpty(searchParam.getUid())) { if (CommonUtils.isNotEmpty(searchParam.uid)) {
queryWrapper.eq("nsu.uid", searchParam.getUid()); queryWrapper.eq("nsu.uid", searchParam.uid);
} }
//排序 //排序
@@ -71,14 +71,14 @@ export class SysUserRoleServiceImplService {
} }
const model: SysUserRole = new SysUserRole(); const model: SysUserRole = new SysUserRole();
model.setUid(addParam.getUid()); model.uid = addParam.uid;
model.siteId = addParam.siteId==null? this.requestContext.siteId:addParam.siteId; model.siteId = addParam.siteId==null? this.requestContext.siteId:addParam.siteId;
model.setRoleIds(addParam.getRoleIds()); model.roleIds = addParam.roleIds;
model.createTime = DateUtils.currTime(); model.createTime = DateUtils.currTime();
model.setIsAdmin(addParam.getIsAdmin()==null?0:addParam.getIsAdmin()); model.isAdmin = addParam.isAdmin==null?0:addParam.isAdmin;
model.status = ObjectUtil.isNull(addParam.status? StatusEnum.ON.status : addParam.status); model.status = ObjectUtil.isNull(addParam.status? StatusEnum.ON.status : addParam.status);
if(model.status<1){ if(model.status<1){
model.setRoleIds(addParam.getRoleIds()==null? JSONUtil.toJsonStr(new JsonArray()):addParam.getRoleIds()); model.roleIds = addParam.roleIds==null? JSONUtil.toJsonStr(new JsonArray():addParam.roleIds);
} }
this.sysUserRoleRepository.save(model); this.sysUserRoleRepository.save(model);
} }
@@ -91,13 +91,13 @@ export class SysUserRoleServiceImplService {
.eq("site_id", editParam.siteId) .eq("site_id", editParam.siteId)
.last("limit 1")); .last("limit 1"));
if (!model) throw new BadRequestException("数据不存在!"); if (!model) throw new BadRequestException("数据不存在!");
const isAdmin: number = model.getIsAdmin(); const isAdmin: number = model.isAdmin;
if(isAdmin>0){ if(isAdmin>0){
//超级管理员不允许改动权限 //超级管理员不允许改动权限
throw new AdminException("ADMIN_NOT_ALLOW_EDIT_ROLE"); throw new AdminException("ADMIN_NOT_ALLOW_EDIT_ROLE");
} }
model.status = editParam.status; model.status = editParam.status;
model.setRoleIds(editParam.getRoleIds()); model.roleIds = editParam.roleIds;
sysUserRoleMapper.updateById(model); sysUserRoleMapper.updateById(model);
} }

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

@@ -36,17 +36,17 @@ export class SysUserServiceImplService {
any /* TODO: QueryWrapper<SysUser> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<SysUser> */ queryWrapper = new QueryWrapper();
queryWrapper.orderByDesc("uid"); queryWrapper.orderByDesc("uid");
if (ObjectUtil.isNotNull(searchParam.getUsername()) && CommonUtils.isNotEmpty(searchParam.getUsername())) { if (ObjectUtil.isNotNull(searchParam.username) && CommonUtils.isNotEmpty(searchParam.username)) {
queryWrapper.like("username", searchParam.getUsername()).or().like("real_name", searchParam.getUsername()); queryWrapper.like("username", searchParam.username).or().like("real_name", searchParam.username);
} }
if (ObjectUtil.isNotNull(searchParam.getLastTime()) && CommonUtils.isNotEmpty(searchParam.getLastTime())) { if (ObjectUtil.isNotNull(searchParam.lastTime) && CommonUtils.isNotEmpty(searchParam.lastTime)) {
const startTime: number = 0; const startTime: number = 0;
const endTime: number = 0; const endTime: number = 0;
if (ObjectUtil.isNotNull(searchParam.getLastTime()[0])) { if (ObjectUtil.isNotNull(searchParam.lastTime[0])) {
startTime = DateUtils.StringToTimestamp(searchParam.getLastTime()[0]); startTime = DateUtils.StringToTimestamp(searchParam.lastTime[0]);
} }
if (ObjectUtil.isNotNull(searchParam.getLastTime()[1])) { if (ObjectUtil.isNotNull(searchParam.lastTime[1])) {
endTime = DateUtils.StringToTimestamp(searchParam.getLastTime()[1]); endTime = DateUtils.StringToTimestamp(searchParam.lastTime[1]);
} }
if (startTime > 0 && endTime > 0) { if (startTime > 0 && endTime > 0) {
queryWrapper.between("last_time", startTime, endTime); queryWrapper.between("last_time", startTime, endTime);
@@ -64,8 +64,8 @@ export class SysUserServiceImplService {
const vo: SysUserListVo = new SysUserListVo(); const vo: SysUserListVo = new SysUserListVo();
Object.assign(vo, item); Object.assign(vo, item);
const siteNum: number = this.sysUserRoleRepository.count({ /* TODO: 将QueryWrapper改为where条件 */ })).ne("site_id", RequestUtils.defaultSiteId())); const siteNum: number = this.sysUserRoleRepository.count({ /* TODO: 将QueryWrapper改为where条件 */ })).ne("site_id", RequestUtils.defaultSiteId()));
vo.setSiteNum(siteNum.intValue()); vo.siteNum = siteNum.intValue();
vo.setIsSuperAdmin(superAdminUid == item.getUid()); vo.isSuperAdmin = superAdminUid == item.uid;
list.push(vo); list.push(vo);
} }
return PageResult.build(page, limit, iPageTotal).setData(list); return PageResult.build(page, limit, iPageTotal).setData(list);
@@ -89,10 +89,10 @@ export class SysUserServiceImplService {
userRoleMPJQueryWrapper.select("sur.*, s.site_id, s.site_name, s.app_type, s.status as siteStatus, s.expire_time") userRoleMPJQueryWrapper.select("sur.*, s.site_id, s.site_name, s.app_type, s.status as siteStatus, s.expire_time")
.setAlias("sur") .setAlias("sur")
.leftJoin("?_site s ON sur.site_id = s.site_id".replace("?_", this.appConfig.tablePrefix)); .leftJoin("?_site s ON sur.site_id = s.site_id".replace("?_", this.appConfig.tablePrefix));
userRoleMPJQueryWrapper.eq("sur.uid", vo.getUid()); userRoleMPJQueryWrapper.eq("sur.uid", vo.uid);
const userSiteRoleVoList: SysUserSiteRoleVo[] = sysUserRoleMapper.selectJoinList(SysUserSiteRoleVo.class, userRoleMPJQueryWrapper); const userSiteRoleVoList: SysUserSiteRoleVo[] = sysUserRoleMapper.selectJoinList(SysUserSiteRoleVo.class, userRoleMPJQueryWrapper);
vo.setIsSuperAdmin(superAdminUid == id); vo.isSuperAdmin = superAdminUid == id;
vo.setRoles(userSiteRoleVoList); vo.roles = userSiteRoleVoList;
return vo; return vo;
} }
@@ -100,27 +100,27 @@ export class SysUserServiceImplService {
* add * add
*/ */
async add(addParam: SysUserParam): Promise<any> { async add(addParam: SysUserParam): Promise<any> {
if (checkUserName(addParam.getUsername())) { if (checkUserName(addParam.username)) {
throw new AdminException("该用户名已被占用，请更换"); throw new AdminException("该用户名已被占用，请更换");
} }
const sysUser: SysUser = new SysUser(); const sysUser: SysUser = new SysUser();
Object.assign(sysUser, addParam); Object.assign(sysUser, addParam);
sysUser.createTime = DateUtils.currTime(); sysUser.createTime = DateUtils.currTime();
sysUser.updateTime = DateUtils.currTime(); sysUser.updateTime = DateUtils.currTime();
sysUser.setPassword(PasswordEncipher.encode(addParam.getPassword())); sysUser.password = PasswordEncipher.encode(addParam.password);
this.sysUserRepository.save(sysUser); this.sysUserRepository.save(sysUser);
const uid: number = sysUser.getUid(); const uid: number = sysUser.uid;
//添加用户建站限制 //添加用户建站限制
const createSiteLimitParamList: SysCreateSiteLimitParam[] = addParam.getCreateSiteLimit(); const createSiteLimitParamList: SysCreateSiteLimitParam[] = addParam.createSiteLimit;
const addList: UserCreateSiteLimit[] = []; const addList: UserCreateSiteLimit[] = [];
if (ObjectUtil.isNotNull(createSiteLimitParamList) && createSiteLimitParamList.length > 0) { if (ObjectUtil.isNotNull(createSiteLimitParamList) && createSiteLimitParamList.length > 0) {
for (const sysCreateSiteLimitParam of createSiteLimitParamList) { for (const sysCreateSiteLimitParam of createSiteLimitParamList) {
const userCreateSiteLimit: UserCreateSiteLimit = new UserCreateSiteLimit(); const userCreateSiteLimit: UserCreateSiteLimit = new UserCreateSiteLimit();
userCreateSiteLimit.setUid(uid); userCreateSiteLimit.uid = uid;
userCreateSiteLimit.setGroupId(sysCreateSiteLimitParam.getGroupId()); userCreateSiteLimit.groupId = sysCreateSiteLimitParam.groupId;
userCreateSiteLimit.setMonth(sysCreateSiteLimitParam.getMonth()); userCreateSiteLimit.month = sysCreateSiteLimitParam.month;
userCreateSiteLimit.setNum(sysCreateSiteLimitParam.getNum()); userCreateSiteLimit.num = sysCreateSiteLimitParam.num;
addList.push(userCreateSiteLimit); addList.push(userCreateSiteLimit);
} }
this.userCreateSiteLimitRepository.save(addList); this.userCreateSiteLimitRepository.save(addList);
@@ -142,15 +142,15 @@ export class SysUserServiceImplService {
isOffStatus = true; isOffStatus = true;
} }
} }
if (ObjectUtil.isNotNull(editParam.getHeadImg())) { if (ObjectUtil.isNotNull(editParam.headImg)) {
model.setHeadImg(editParam.getHeadImg()); model.headImg = editParam.headImg;
} }
if (ObjectUtil.isNotNull(editParam.getRealName())) { if (ObjectUtil.isNotNull(editParam.realName)) {
model.setRealName(editParam.getRealName()); model.realName = editParam.realName;
} }
const isChangePassword: boolean = false; const isChangePassword: boolean = false;
if (ObjectUtil.isNotNull(editParam.getPassword()) && CommonUtils.isNotEmpty(editParam.getPassword())) { if (ObjectUtil.isNotNull(editParam.password) && CommonUtils.isNotEmpty(editParam.password)) {
model.setPassword(PasswordEncipher.encode(editParam.getPassword())); model.password = PasswordEncipher.encode(editParam.password);
isChangePassword = true; isChangePassword = true;
} }
/** /**
@@ -204,9 +204,9 @@ export class SysUserServiceImplService {
.last("limit 1")); .last("limit 1"));
if (!model) throw new BadRequestException("数据不存在!"); if (!model) throw new BadRequestException("数据不存在!");
model.setLastTime(DateUtils.currTime()); model.lastTime = DateUtils.currTime();
model.setLastIp(IpUtils.getIpAddr(RequestUtils.handler())); model.lastIp = IpUtils.getIpAddr(RequestUtils.handler());
model.setLoginCount(model.getLoginCount() + 1); model.loginCount = model.loginCount + 1;
sysUserMapper.updateById(model); sysUserMapper.updateById(model);
} }
@@ -216,39 +216,39 @@ export class SysUserServiceImplService {
async addSiteUser(siteUserParam: SiteUserParam, siteId: number): Promise<any> { async addSiteUser(siteUserParam: SiteUserParam, siteId: number): Promise<any> {
const uid: number = 0; const uid: number = 0;
try { try {
if (ObjectUtil.isNotNull(siteUserParam.getUid()) && siteUserParam.getUid() > 0) { if (ObjectUtil.isNotNull(siteUserParam.uid) && siteUserParam.uid > 0) {
any /* TODO: QueryWrapper<SysUser> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<SysUser> */ queryWrapper = new QueryWrapper();
queryWrapper.eq("uid", siteUserParam.getUid()); queryWrapper.eq("uid", siteUserParam.uid);
const sysUser: SysUser = this.sysUserRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }); const sysUser: SysUser = this.sysUserRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
uid = siteUserParam.getUid(); uid = siteUserParam.uid;
if (ObjectUtil.isNull(sysUser)) { if (ObjectUtil.isNull(sysUser)) {
throw new AdminException("USER_NOT_EXIST"); throw new AdminException("USER_NOT_EXIST");
} }
} else { } else {
const sysUserParam: SysUserParam = new SysUserParam(); const sysUserParam: SysUserParam = new SysUserParam();
sysUserParam.setHeadImg(siteUserParam.getHeadImg()); sysUserParam.headImg = siteUserParam.headImg;
sysUserParam.setPassword(siteUserParam.getPassword()); sysUserParam.password = siteUserParam.password;
sysUserParam.setLastIp(""); sysUserParam.lastIp = "";
sysUserParam.setLoginCount(0); sysUserParam.loginCount = 0;
sysUserParam.setUsername(siteUserParam.getUsername()); sysUserParam.username = siteUserParam.username;
sysUserParam.setIsDel(0); sysUserParam.isDel = 0;
sysUserParam.setLastTime(DateUtils.currTime()); sysUserParam.lastTime = DateUtils.currTime();
sysUserParam.status = siteUserParam.status; sysUserParam.status = siteUserParam.status;
sysUserParam.setRealName(siteUserParam.getRealName()); sysUserParam.realName = siteUserParam.realName;
//添加用户 //添加用户
uid = this.push(sysUserParam); uid = this.push(sysUserParam);
} }
const roleIds: string[] = siteUserParam.getRoleIds(); const roleIds: string[] = siteUserParam.roleIds;
const isAdmin: number = siteUserParam.getIsAdmin() == null ? 0 : siteUserParam.getIsAdmin(); const isAdmin: number = siteUserParam.isAdmin == null ? 0 : siteUserParam.isAdmin;
/** /**
* 创建用户站点管理权限 * 创建用户站点管理权限
*/ */
const sysUserRoleParam: SysUserRoleParam = new SysUserRoleParam(); const sysUserRoleParam: SysUserRoleParam = new SysUserRoleParam();
sysUserRoleParam.setRoleIds(JSONUtil.toJsonStr(roleIds)); sysUserRoleParam.roleIds = JSONUtil.toJsonStr(roleIds);
sysUserRoleParam.siteId = siteId; sysUserRoleParam.siteId = siteId;
sysUserRoleParam.setUid(uid); sysUserRoleParam.uid = uid;
sysUserRoleParam.status = siteUserParam.status; sysUserRoleParam.status = siteUserParam.status;
sysUserRoleParam.setIsAdmin(isAdmin); sysUserRoleParam.isAdmin = isAdmin;
this.sysUserRoleService.push(sysUserRoleParam); this.sysUserRoleService.push(sysUserRoleParam);
} catch (e) { } catch (e) {
throw new AdminException(e.message); throw new AdminException(e.message);
@@ -308,12 +308,12 @@ export class SysUserServiceImplService {
* addUserCreateSiteLimit * addUserCreateSiteLimit
*/ */
async addUserCreateSiteLimit(userCreateSiteLimitAddParam: SysUserCreateSiteLimitAddParam): Promise<any> { async addUserCreateSiteLimit(userCreateSiteLimitAddParam: SysUserCreateSiteLimitAddParam): Promise<any> {
this.userCreateSiteLimitRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("group_id", userCreateSiteLimitAddParam.getGroupId())); this.userCreateSiteLimitRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("group_id", userCreateSiteLimitAddParam.groupId));
const userCreateSiteLimit: UserCreateSiteLimit = new UserCreateSiteLimit(); const userCreateSiteLimit: UserCreateSiteLimit = new UserCreateSiteLimit();
userCreateSiteLimit.setNum(userCreateSiteLimitAddParam.getNum()); userCreateSiteLimit.num = userCreateSiteLimitAddParam.num;
userCreateSiteLimit.setUid(userCreateSiteLimitAddParam.getUid()); userCreateSiteLimit.uid = userCreateSiteLimitAddParam.uid;
userCreateSiteLimit.setMonth(userCreateSiteLimitAddParam.getMonth()); userCreateSiteLimit.month = userCreateSiteLimitAddParam.month;
userCreateSiteLimit.setGroupId(userCreateSiteLimitAddParam.getGroupId()); userCreateSiteLimit.groupId = userCreateSiteLimitAddParam.groupId;
this.userCreateSiteLimitRepository.save(userCreateSiteLimit); this.userCreateSiteLimitRepository.save(userCreateSiteLimit);
} }
@@ -322,8 +322,8 @@ export class SysUserServiceImplService {
*/ */
async editUserCreateSiteLimit(userCreateSiteLimitEditParam: SysUserCreateSiteLimitEditParam): Promise<any> { async editUserCreateSiteLimit(userCreateSiteLimitEditParam: SysUserCreateSiteLimitEditParam): Promise<any> {
const userCreateSiteLimit: UserCreateSiteLimit = userCreateSiteLimitMapper.selectById(userCreateSiteLimitEditParam.id); const userCreateSiteLimit: UserCreateSiteLimit = userCreateSiteLimitMapper.selectById(userCreateSiteLimitEditParam.id);
userCreateSiteLimit.setNum(userCreateSiteLimitEditParam.getNum()); userCreateSiteLimit.num = userCreateSiteLimitEditParam.num;
userCreateSiteLimit.setMonth(userCreateSiteLimitEditParam.getMonth()); userCreateSiteLimit.month = userCreateSiteLimitEditParam.month;
userCreateSiteLimitMapper.updateById(userCreateSiteLimit); userCreateSiteLimitMapper.updateById(userCreateSiteLimit);
} }
@@ -349,7 +349,7 @@ export class SysUserServiceImplService {
async getUserSelect(username: string): Promise<any> { async getUserSelect(username: string): Promise<any> {
// 1. 构建查询条件 // 1. 构建查询条件
MPJany /* TODO: QueryWrapper<SysUser> */ qw = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<SysUser> */ qw = new MPJQueryWrapper();
qw.setAlias("u") qw.alias = "u"
.leftJoin("?_sys_user_role ur on u.uid = ur.uid".replace("?_", this.appConfig.tablePrefix)) .leftJoin("?_sys_user_role ur on u.uid = ur.uid".replace("?_", this.appConfig.tablePrefix))
.select("u.uid, u.username, u.head_img") .select("u.uid, u.username, u.head_img")
.and(wrapper => wrapper.eq("ur.is_admin", 1)) .and(wrapper => wrapper.eq("ur.is_admin", 1))
@@ -359,7 +359,7 @@ export class SysUserServiceImplService {
// 2. 获取并过滤用户 // 2. 获取并过滤用户
const userAll: SysUser[] = StringUtils.isNotEmpty(username) const userAll: SysUser[] = StringUtils.isNotEmpty(username)
? getUserAll().stream() ? getUserAll().stream()
.filter(item => item.getUsername() === username) .filter(item => item.username === username)
: getUserAll(); : getUserAll();
@@ -396,12 +396,12 @@ export class SysUserServiceImplService {
adminUsers.forEach(user => { adminUsers.forEach(user => {
const vo: SysUserInfoVo = new SysUserInfoVo(); const vo: SysUserInfoVo = new SysUserInfoVo();
Object.assign(vo, user); Object.assign(vo, user);
resultMap.put(user.getUid(), vo); resultMap.put(user.uid, vo);
}); });
noRoleUsers.forEach(user => { noRoleUsers.forEach(user => {
const vo: SysUserInfoVo = new SysUserInfoVo(); const vo: SysUserInfoVo = new SysUserInfoVo();
Object.assign(vo, user); Object.assign(vo, user);
resultMap.put(user.getUid(), vo); resultMap.put(user.uid, vo);
}); });
return new ArrayList<>(resultMap.values()); return new ArrayList<>(resultMap.values());

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

@@ -17,13 +17,13 @@ export class SystemServiceImplService {
*/ */
async getInfo(): Promise<any> { async getInfo(): Promise<any> {
const statSystemVo: StatSystemVo = new StatSystemVo(); const statSystemVo: StatSystemVo = new StatSystemVo();
statSystemVo.setOs(System.getProperty("os.name", "Linux")); statSystemVo.os = System.getProperty("os.name", "Linux");
statSystemVo.setEnvironment(System.getProperty("catalina.home")); statSystemVo.environment = System.getProperty("catalina.home");
statSystemVo.setPhpV(System.getProperty("java.version")); statSystemVo.phpV = System.getProperty("java.version");
const statVersionVo: StatVersionVo = new StatVersionVo(); const statVersionVo: StatVersionVo = new StatVersionVo();
statVersionVo.version = "202406150001"; statVersionVo.version = "202406150001";
statVersionVo.setCode("0.4.0"); statVersionVo.code = "0.4.0";
statSystemVo.version = statVersionVo; statSystemVo.version = statVersionVo;
return statSystemVo; return statSystemVo;
@@ -33,7 +33,7 @@ export class SystemServiceImplService {
* clearCache * clearCache
*/ */
async clearCache(): Promise<any> { async clearCache(): Promise<any> {
cached.getAllKeys().stream().forEach(key => cached.remove(key)); cached.allKeys.stream().forEach(key => cached.remove(key));
} }
/** /**
@@ -44,13 +44,13 @@ export class SystemServiceImplService {
try { try {
const data: Record<String, Object> = {}; const data: Record<String, Object> = {};
for (SpreadQrcodeParam.Param qrcodeParam : param.getParams()) { for (SpreadQrcodeParam.Param qrcodeParam : param.params) {
const jsonArray: JSONArray = JSONUtil.parseArray(qrcodeParam); const jsonArray: JSONArray = JSONUtil.parseArray(qrcodeParam);
const jsonObject: Record<string, any> = JsonUtils.parseObject<any>(jsonArray); const jsonObject: Record<string, any> = JsonUtils.parseObject<any>(jsonArray);
data.put(jsonObject.getStr("name"), qrcodeParam.getColumnValue()); data.put(jsonObject.getStr("name"), qrcodeParam.columnValue);
} }
const dir: string = "upload/qrcode/" + this.requestContext.siteId + "/" + param.getFolder(); const dir: string = "upload/qrcode/" + this.requestContext.siteId + "/" + param.folder;
vo.setWeappPath(QrcodeUtils.qrcodeToFile(this.requestContext.siteId, "weapp", "", param.page, data, dir)); vo.weappPath = QrcodeUtils.qrcodeToFile(this.requestContext.siteId, "weapp", "", param.page, data, dir);
} catch (e) { } catch (e) {
} }
@@ -61,9 +61,9 @@ export class SystemServiceImplService {
* getDatabaseVersion * getDatabaseVersion
*/ */
async getDatabaseVersion(): Promise<any> { async getDatabaseVersion(): Promise<any> {
try (const connection: Connection = dataSource.getConnection()) { try (const connection: Connection = dataSource.connection) {
const metaData: DatabaseMetaData = connection.getMetaData(); const metaData: DatabaseMetaData = connection.metaData;
return metaData.getDatabaseProductVersion(); return metaData.databaseProductVersion;
}catch (e) { }catch (e) {
return "未知"; return "未知";
} }

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

@@ -85,14 +85,14 @@ export class UpgradeServiceImplService {
* getUpgradeContent * getUpgradeContent
*/ */
async getUpgradeContent(addon: string): Promise<any> { async getUpgradeContent(addon: string): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.getInstance(); const instance: NiucloudUtils = NiucloudUtils.instance;
const vo: UpgradeContentVo = new UpgradeContentVo(); const vo: UpgradeContentVo = new UpgradeContentVo();
const apps: Map[] = []; const apps: Map[] = [];
if ((!addon || addon.length === 0)) { if ((!addon || addon.length === 0)) {
const query: Record<String, Object> = {}; const query: Record<String, Object> = {};
query.put("product_key", instance.getProductKey()); query.put("product_key", instance.productKey);
query.put("app_key", this.appConfig.appKey); query.put("app_key", this.appConfig.appKey);
query.put("version", this.appConfig.version); query.put("version", this.appConfig.version);
apps.push(query); apps.push(query);
@@ -100,7 +100,7 @@ export class UpgradeServiceImplService {
for (const key of addon.split(",")) { for (const key of addon.split(",")) {
const addonModel: Addon = this.addonRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).select("version,type")); const addonModel: Addon = this.addonRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).select("version,type"));
const query: Record<String, Object> = {}; const query: Record<String, Object> = {};
query.put("product_key", instance.getProductKey()); query.put("product_key", instance.productKey);
query.put("app_key", key); query.put("app_key", key);
query.put("version", addonModel.version); query.put("version", addonModel.version);
if (addonModel.type === AddonTypeEnum.APP.type) { if (addonModel.type === AddonTypeEnum.APP.type) {
@@ -115,12 +115,12 @@ export class UpgradeServiceImplService {
const content: Record<string, any> = NiucloudUtils.Niucloud.get("member_app_upgrade/content", item).getRecord<string, any>("data"); const content: Record<string, any> = NiucloudUtils.Niucloud.get("member_app_upgrade/content", item).getRecord<string, any>("data");
if (content != null) { if (content != null) {
UpgradeContentVo.const contentVo: Content = JSONUtil.toBean(content, UpgradeContentVo.Content.class); UpgradeContentVo.const contentVo: Content = JSONUtil.toBean(content, UpgradeContentVo.Content.class);
vo.getContent().add(contentVo); vo.content.add(contentVo);
vo.getUpgradeApps().add(contentVo.getApp().getAppKey()); vo.upgradeApps.add(contentVo.app.getAppKey());
} }
} }
vo.setLastBackup(this.sysBackupRecordsRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) vo.lastBackup = this.sysBackupRecordsRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }
.orderByDesc("complete_time") .orderByDesc("complete_time")
.last("limit 1") .last("limit 1")
)); ));
@@ -135,24 +135,24 @@ export class UpgradeServiceImplService {
if (this.appConfig.runActive === "dev") throw new BadRequestException("开发环境下请先关闭服务启动webroot/jar下的web-app-boot-exec进行升级"); if (this.appConfig.runActive === "dev") throw new BadRequestException("开发环境下请先关闭服务启动webroot/jar下的web-app-boot-exec进行升级");
if (getUpgradeTask() != null) throw new BadRequestException("已经有正在升级中的任务"); if (getUpgradeTask() != null) throw new BadRequestException("已经有正在升级中的任务");
const upgradeContent: UpgradeContentVo = getUpgradeContent(upgradeParam.getAddon()); const upgradeContent: UpgradeContentVo = getUpgradeContent(upgradeParam.addon);
upgradeContent.setContent(upgradeContent.getContent().stream().filter(c => c.getVersionList().size() > 0)); upgradeContent.content = upgradeContent.content.stream(.filter(c => c.versionList.size() > 0));
upgradeContent.setUpgradeApps(upgradeContent.getContent().stream().map(c => c.getApp().getAppKey())); upgradeContent.upgradeApps = upgradeContent.content.stream(.map(c => c.app.getAppKey()));
if (upgradeContent.getContent().size() == 0) throw new BadRequestException("没有获取到可以升级的内容"); if (upgradeContent.content.size() == 0) throw new BadRequestException("没有获取到可以升级的内容");
const instance: NiucloudUtils = NiucloudUtils.getInstance(); const instance: NiucloudUtils = NiucloudUtils.instance;
// 获取下载token // 获取下载token
const actionQuery: Record<String, Object> = new const query: Record<>(); const actionQuery: Record<String, Object> = new const query: Record<>();
actionQuery.put("data[product_key]", instance.getProductKey()); actionQuery.put("data[product_key]", instance.productKey);
actionQuery.put("data[framework_version]", this.appConfig.version); actionQuery.put("data[framework_version]", this.appConfig.version);
actionQuery.put("data[app_key]", upgradeContent.getContent().get(0).getApp().getAppKey()); actionQuery.put("data[app_key]", upgradeContent.content.get(0).getApp().getAppKey());
actionQuery.put("data[version]", upgradeContent.getContent().get(0).getVersion()); actionQuery.put("data[version]", upgradeContent.content.get(0).getVersion());
const actionToken: Record<string, any> = this.niucloudService.getActionToken("upgrade", actionQuery); const actionToken: Record<string, any> = this.niucloudService.getActionToken("upgrade", actionQuery);
Record<String, Object> = {}; Record<String, Object> = {};
query.put("authorize_code", instance.getCode()); query.put("authorize_code", instance.code);
query.put("token", actionToken == null ? "" : actionToken.getStr("token")); query.put("token", actionToken == null ? "" : actionToken.getStr("token"));
const response: HttpResponse = new NiucloudUtils.Cloud().build("cloud/upgrade").query(query).method(Method.GET).execute(); const response: HttpResponse = new NiucloudUtils.Cloud().build("cloud/upgrade").query(query).method(Method.GET).execute();
@@ -162,40 +162,40 @@ export class UpgradeServiceImplService {
if (body.getInt("code").equals(0)) throw new Error(body.getStr("msg")); if (body.getInt("code").equals(0)) throw new Error(body.getStr("msg"));
const vo: UpgradeTaskVo = new UpgradeTaskVo(); const vo: UpgradeTaskVo = new UpgradeTaskVo();
vo.setEnvType(this.appConfig.envType); vo.envType = this.appConfig.envType;
vo.setUpgradeTime(DateUtil.now()); vo.upgradeTime = DateUtil.now();
vo.setAddon(actionQuery.get("data[app_key]")); vo.addon = actionQuery.get("data[app_key]");
vo.key = RandomUtil.randomString(10); vo.key = RandomUtil.randomString(10);
vo.setUpgrade(actionQuery); vo.upgrade = actionQuery;
vo.setStep("requestUpgrade"); vo.step = "requestUpgrade";
vo.getExecuted().add("requestUpgrade"); vo.executed.add("requestUpgrade");
vo.getLog().add(vo.getSteps().get("requestUpgrade").getTitle()); vo.log.add(vo.steps.get("requestUpgrade").getTitle());
vo.setParams(query); vo.params = query;
vo.setUpgradeContent(upgradeContent); vo.upgradeContent = upgradeContent;
if (!upgradeParam.getIsNeedBackup()) { if (!upgradeParam.isNeedBackup) {
vo.getSteps().remove("backupCode"); vo.steps.remove("backupCode");
vo.getSteps().remove("backupSql"); vo.steps.remove("backupSql");
} }
if (!upgradeParam.getIsNeedCloudbuild()) { if (!upgradeParam.isNeedCloudbuild) {
vo.getSteps().remove("cloudBuild"); vo.steps.remove("cloudBuild");
vo.getSteps().remove("gteCloudBuildLog"); vo.steps.remove("gteCloudBuildLog");
} }
// 添加升级记录 // 添加升级记录
const content: JSONArray = new JSONArray(); const content: JSONArray = new JSONArray();
upgradeContent.getContent().stream().forEach(i => { upgradeContent.content.stream().forEach(i => {
const item: Record<string, any> = new Record<string, any>(); const item: Record<string, any> = new Record<string, any>();
item.set("app_key", i.getApp().getAppKey()); item.set("app_key", i.app.getAppKey());
item.putByPath("app.name", i.getApp().getAppName()); item.putByPath("app.name", i.app.getAppName());
item.set("version", i.version); item.set("version", i.version);
item.set("upgrade_version", i.getUpgradeVersion()); item.set("upgrade_version", i.upgradeVersion);
content.put(item); content.put(item);
}); });
const record: SysUpgradeRecordsParam = new SysUpgradeRecordsParam(); const record: SysUpgradeRecordsParam = new SysUpgradeRecordsParam();
record.setUpgradeKey(vo.key); record.upgradeKey = vo.key;
record.status = UpgradeRecordStatusEnum.STATUS_READY.status; record.status = UpgradeRecordStatusEnum.STATUS_READY.status;
record.setContent(content.toString()); record.content = content.toString();
this.sysUpgradeRecordsService.push(record); this.sysUpgradeRecordsService.push(record);
setUpgradeTaskCache(vo); setUpgradeTaskCache(vo);
@@ -206,7 +206,7 @@ export class UpgradeServiceImplService {
* getUpgradeTask * getUpgradeTask
*/ */
async getUpgradeTask(): Promise<any> { async getUpgradeTask(): Promise<any> {
const cache: Cached = CacheFactory.getCacheOperator(); const cache: Cached = CacheFactory.cacheOperator;
const data: Object = cache.get("upgrade"); const data: Object = cache.get("upgrade");
if (data == null) return null; if (data == null) return null;
return Object.assign(new UpgradeTaskVo(), JsonUtils.parseObject<any>(data)) /* TODO: 检查UpgradeTaskVo构造函数 */; return Object.assign(new UpgradeTaskVo(), JsonUtils.parseObject<any>(data)) /* TODO: 检查UpgradeTaskVo构造函数 */;
@@ -216,7 +216,7 @@ export class UpgradeServiceImplService {
* setUpgradeTaskCache * setUpgradeTaskCache
*/ */
async setUpgradeTaskCache(vo: UpgradeTaskVo): Promise<any> { async setUpgradeTaskCache(vo: UpgradeTaskVo): Promise<any> {
const cache: Cached = CacheFactory.getCacheOperator(); const cache: Cached = CacheFactory.cacheOperator;
cache.put("upgrade", JsonUtils.parseObject<any>(vo).toString()); cache.put("upgrade", JsonUtils.parseObject<any>(vo).toString());
} }
@@ -230,7 +230,7 @@ export class UpgradeServiceImplService {
} catch (e) { } catch (e) {
} }
} }
const cache: Cached = CacheFactory.getCacheOperator(); const cache: Cached = CacheFactory.cacheOperator;
cache.remove("upgrade"); cache.remove("upgrade");
} }
@@ -238,36 +238,36 @@ export class UpgradeServiceImplService {
* execute * execute
*/ */
async execute(): Promise<any> { async execute(): Promise<any> {
const vo: UpgradeTaskVo = this.getUpgradeTask(); const vo: UpgradeTaskVo = this.upgradeTask;
if (vo == null) return; if (vo == null) return;
if (CommonUtils.isNotEmpty(vo.status) && vo.status === "restarting") return; if (CommonUtils.isNotEmpty(vo.status) && vo.status === "restarting") return;
const steps: string[] = vo.getSteps().keySet().stream(); const steps: string[] = vo.steps.keySet().stream();
const step: string = steps.indexOf(vo.getStep()) < steps.length - 1 ? steps.get(steps.indexOf(vo.getStep()) + 1) : ""; const step: string = steps.indexOf(vo.step) < steps.length - 1 ? steps.get(steps.indexOf(vo.step) + 1) : "";
if ((step && step.length > 0)) { if ((step && step.length > 0)) {
if (!vo.getExecuted().includes(step)) { if (!vo.executed.includes(step)) {
vo.getExecuted().add(step); vo.executed.add(step);
vo.getLog().add(vo.getSteps().get(step).getTitle()); vo.log.add(vo.steps.get(step).getTitle());
} }
try { try {
const param: Record<String, Object> = null; const param: Record<String, Object> = null;
param = (Record<String, Object>) dynamicMethodCall(step, vo); param = (Record<String, Object>) dynamicMethodCall(step, vo);
if (param != null) { if (param != null) {
vo.setParams(param); vo.params = param;
} else { } else {
vo.setStep(step); vo.step = step;
vo.setParams(null); vo.params = null;
vo.setAddon(vo.getUpgradeApps().get(0)); vo.addon = vo.upgradeApps.get(0);
} }
setUpgradeTaskCache(vo); setUpgradeTaskCache(vo);
} catch (e) { } catch (e) {
if (e.message.includes("队列")) { if (e.message.includes("队列")) {
throw e; throw e;
} else { } else {
vo.setStep(step); vo.step = step;
vo.getError().add(e.message); vo.error.add(e.message);
setUpgradeTaskCache(vo); setUpgradeTaskCache(vo);
this.upgradeErrorHandle(vo); this.upgradeErrorHandle(vo);
console.error(e); console.error(e);
@@ -282,13 +282,13 @@ export class UpgradeServiceImplService {
*/ */
async coverCode(vo: UpgradeTaskVo): Promise<any> { async coverCode(vo: UpgradeTaskVo): Promise<any> {
if (this.appConfig.envType === "dev") { if (this.appConfig.envType === "dev") {
vo.getUpgradeContent().getContent().forEach(item => { vo.upgradeContent.getContent().forEach(item => {
const appKey: string = item.getApp().getAppKey(); const appKey: string = item.app.getAppKey();
const codeDir: string = upgradeDir(vo + "/download/" + appKey); const codeDir: string = upgradeDir(vo + "/download/" + appKey);
// 判断目录存在并且不为空 // 判断目录存在并且不为空
if (fs.existsSync(codeDir) && fs.readdirSync(codeDir).length > 0) { if (fs.existsSync(codeDir) && fs.readdirSync(codeDir).length > 0) {
item.getVersionList().stream().collect(/* Collectors已删除 */.collectingAndThen( item.versionList.stream().collect(/* Collectors已删除 */.collectingAndThen(
, ,
l => { l => {
Collections.reverse(l); Collections.reverse(l);
@@ -322,7 +322,7 @@ export class UpgradeServiceImplService {
} }
} }
const changeDir: string = codeDir, version.getVersionNo(); const changeDir: string = codeDir, version.versionNo;
if (fs.existsSync(changeDir)) { if (fs.existsSync(changeDir)) {
try { try {
FileUtils.copyDirectory(changeDir, rootDir); FileUtils.copyDirectory(changeDir, rootDir);
@@ -352,11 +352,11 @@ export class UpgradeServiceImplService {
vo.status = "restarting"; vo.status = "restarting";
setUpgradeTaskCache(vo); setUpgradeTaskCache(vo);
} else { } else {
vo.setStep("coverCode"); vo.step = "coverCode";
vo.status = "restarting"; vo.status = "restarting";
setUpgradeTaskCache(vo); setUpgradeTaskCache(vo);
fs.writeFileSync(upgradeDir(vo, "upgrade.json"), JsonUtils.parseObject<any>(vo.getUpgradeContent()).toString(), "UTF-8"); fs.writeFileSync(upgradeDir(vo, "upgrade.json"), JsonUtils.parseObject<any>(vo.upgradeContent).toString(), "UTF-8");
PipeNameUtils.noticeBootRestartByUpgrade(this.appConfig.applicationName, vo.key, vo.getUpgradeContent().getLastBackup().getBackupKey()); PipeNameUtils.noticeBootRestartByUpgrade(this.appConfig.applicationName, vo.key, vo.upgradeContent.getLastBackup().getBackupKey());
Thread.sleep(3000); Thread.sleep(3000);
} }
} }
@@ -367,7 +367,7 @@ export class UpgradeServiceImplService {
async handleVue(vo: UpgradeTaskVo): Promise<any> { async handleVue(vo: UpgradeTaskVo): Promise<any> {
const envs: WebAppEnvs = this.appConfig; const envs: WebAppEnvs = this.appConfig;
for (const key of vo.getUpgradeApps()) { for (const key of vo.upgradeApps) {
if (key !== this.appConfig.appKey) { if (key !== this.appConfig.appKey) {
const sourceDir: string = envs.webRootDownAddon + key; const sourceDir: string = envs.webRootDownAddon + key;
if (fs.existsSync(sourceDir)) { if (fs.existsSync(sourceDir)) {
@@ -378,7 +378,7 @@ export class UpgradeServiceImplService {
const addons: string[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }) const addons: string[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })
.select("`key`") .select("`key`")
.eq("status", AddonStatusEnum.ON.getCode())) .eq("status", AddonStatusEnum.ON.code))
.stream().map(i => i.key) .stream().map(i => i.key)
; ;
@@ -392,7 +392,7 @@ export class UpgradeServiceImplService {
// 处理语言包 // 处理语言包
for (const addon of addons) { for (const addon of addons) {
addonInstallTools.setAddon(addon); addonInstallTools.addon = addon;
if (fs.existsSync(envs.webRoot + "uni-app/")) addonInstallTools.mergeUniappLocale(envs.webRoot + "/uni-app/", "install"); if (fs.existsSync(envs.webRoot + "uni-app/")) addonInstallTools.mergeUniappLocale(envs.webRoot + "/uni-app/", "install");
if (fs.existsSync(envs.webRootDownRuntime + "uni-app/")) addonInstallTools.mergeUniappLocale(envs.webRootDownRuntime + "/uni-app/", "install"); if (fs.existsSync(envs.webRootDownRuntime + "uni-app/")) addonInstallTools.mergeUniappLocale(envs.webRootDownRuntime + "/uni-app/", "install");
@@ -413,7 +413,7 @@ export class UpgradeServiceImplService {
async upgradeComplete(vo: UpgradeTaskVo): Promise<any> { async upgradeComplete(vo: UpgradeTaskVo): Promise<any> {
vo.status = "success"; vo.status = "success";
for (const key of vo.getUpgradeApps()) { for (const key of vo.upgradeApps) {
if (key !== this.appConfig.appKey) { if (key !== this.appConfig.appKey) {
const addon: Addon = Object.assign(new Addon(), this.coreAddonService.getAddonConfig(key)) /* TODO: 检查Addon构造函数 */; const addon: Addon = Object.assign(new Addon(), this.coreAddonService.getAddonConfig(key)) /* TODO: 检查Addon构造函数 */;
this.coreAddonService.set(addon); this.coreAddonService.set(addon);
@@ -426,7 +426,7 @@ export class UpgradeServiceImplService {
// 变更升级记录 // 变更升级记录
const editParam: SysUpgradeRecordsParam = new SysUpgradeRecordsParam(); const editParam: SysUpgradeRecordsParam = new SysUpgradeRecordsParam();
editParam.status = UpgradeRecordStatusEnum.STATUS_COMPLETE.status; editParam.status = UpgradeRecordStatusEnum.STATUS_COMPLETE.status;
editParam.setCompleteTime(Date.now() / 1000); editParam.completeTime = Date.now( / 1000);
this.sysUpgradeRecordsService.edit(vo.key, editParam); this.sysUpgradeRecordsService.edit(vo.key, editParam);
this.upgradeService.clearUpgradeTask(5); this.upgradeService.clearUpgradeTask(5);
@@ -441,25 +441,25 @@ export class UpgradeServiceImplService {
LinkedHashMap<String, UpgradeTaskVo.Step> steps = new LinkedHashMap(); LinkedHashMap<String, UpgradeTaskVo.Step> steps = new LinkedHashMap();
steps.put("rollback", new UpgradeTaskVo.Step("rollback", "升级失败开始回滚")); steps.put("rollback", new UpgradeTaskVo.Step("rollback", "升级失败开始回滚"));
if (vo.getExecuted().includes("coverCode")) { if (vo.executed.includes("coverCode")) {
steps.put("restoreCover", new UpgradeTaskVo.Step("restoreCover", "恢复变更文件")); steps.put("restoreCover", new UpgradeTaskVo.Step("restoreCover", "恢复变更文件"));
} }
if (vo.getExecuted().includes("handleUpgrade")) { if (vo.executed.includes("handleUpgrade")) {
steps.put("restoreDatabase", new UpgradeTaskVo.Step("restoreDatabase", "恢复数据库")); steps.put("restoreDatabase", new UpgradeTaskVo.Step("restoreDatabase", "恢复数据库"));
} }
steps.put("restoreComplete", new UpgradeTaskVo.Step("restoreComplete", "回滚完成")); steps.put("restoreComplete", new UpgradeTaskVo.Step("restoreComplete", "回滚完成"));
vo.setSteps(steps); vo.steps = steps;
vo.setStep("rollback"); vo.step = "rollback";
vo.getLog().add(steps.get("rollback").getTitle()); vo.log.add(steps.get("rollback").getTitle());
vo.getExecuted().add("rollback"); vo.executed.add("rollback");
setUpgradeTaskCache(vo); setUpgradeTaskCache(vo);
// 变更升级记录 // 变更升级记录
const editParam: SysUpgradeRecordsParam = new SysUpgradeRecordsParam(); const editParam: SysUpgradeRecordsParam = new SysUpgradeRecordsParam();
editParam.status = UpgradeRecordStatusEnum.STATUS_FAIL.status; editParam.status = UpgradeRecordStatusEnum.STATUS_FAIL.status;
editParam.setFailReason(JSONUtil.toJsonPrettyStr(vo.getError())); editParam.failReason = JSONUtil.toJsonPrettyStr(vo.error);
this.sysUpgradeRecordsService.edit(vo.key, editParam); this.sysUpgradeRecordsService.edit(vo.key, editParam);
} }
@@ -467,16 +467,16 @@ export class UpgradeServiceImplService {
* operate * operate
*/ */
async operate(operate: string): Promise<any> { async operate(operate: string): Promise<any> {
const vo: UpgradeTaskVo = this.getUpgradeTask(); const vo: UpgradeTaskVo = this.upgradeTask;
if (vo == null) return; if (vo == null) return;
switch (operate) { switch (operate) {
case "local": case "local":
vo.setStep("gteCloudBuildLog"); vo.step = "gteCloudBuildLog";
setUpgradeTaskCache(vo); setUpgradeTaskCache(vo);
break; break;
case "rollback": case "rollback":
vo.getError().add("失败原因：一键云编译队列任务过多"); vo.error.add("失败原因：一键云编译队列任务过多");
upgradeErrorHandle(vo); upgradeErrorHandle(vo);
break; break;
} }
@@ -496,13 +496,13 @@ export class UpgradeServiceImplService {
async dynamicMethodCall(methodName: string, args: ): Promise<any> { async dynamicMethodCall(methodName: string, args: ): Promise<any> {
try { try {
// 获取当前类的 Class 对象 // 获取当前类的 Class 对象
Class<?> clazz = this.getClass(); Class<?> clazz = this.class;
// 获取方法对象 // 获取方法对象
java.lang.reflect.const method: Method = clazz.getMethod(methodName, extractParameterTypes(args)); java.lang.reflect.const method: Method = clazz.getMethod(methodName, extractParameterTypes(args));
// 调用方法 // 调用方法
console.log("dynamicMethodCall method：" + methodName); console.log("dynamicMethodCall method：" + methodName);
const result: Object = method.invoke(this, args); const result: Object = method.invoke(this, args);
if (method.getReturnType() == void.class) { if (method.returnType == void.class) {
return null; return null;
} else { } else {
return result; return result;

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

@@ -33,10 +33,10 @@ export class StorageConfigServiceImplService {
const storageValues: Record<string, any> = JsonUtils.parseObject<any>(storageTypeList.get(storageType)); const storageValues: Record<string, any> = JsonUtils.parseObject<any>(storageTypeList.get(storageType));
const coreStorAgeConfigVo: CoreStorAgeConfigVo = new CoreStorAgeConfigVo(); const coreStorAgeConfigVo: CoreStorAgeConfigVo = new CoreStorAgeConfigVo();
coreStorAgeConfigVo.setStorageType(storageType); coreStorAgeConfigVo.storageType = storageType;
coreStorAgeConfigVo.setIsUse(storageType === storageConfig.get("default") ? StorageEnum.ON.getCode() : StorageEnum.OFF.getCode()); coreStorAgeConfigVo.isUse = storageType === storageConfig.get("default" ? StorageEnum.ON.code : StorageEnum.OFF.code);
coreStorAgeConfigVo.name = storageValues.get("name".toString()); coreStorAgeConfigVo.name = storageValues.get("name".toString());
coreStorAgeConfigVo.setComponent(storageValues.get("component").toString()); coreStorAgeConfigVo.component = storageValues.get("component".toString());
const encryptParams: JSONArray = ObjectUtil.defaultIfNull(storageValues.getJSONArray("encrypt_params"), new JSONArray()); const encryptParams: JSONArray = ObjectUtil.defaultIfNull(storageValues.getJSONArray("encrypt_params"), new JSONArray());
@@ -59,7 +59,7 @@ export class StorageConfigServiceImplService {
params.set(paramsKey, itemParam); params.set(paramsKey, itemParam);
} }
} }
coreStorAgeConfigVo.setParams(params); coreStorAgeConfigVo.params = params;
return coreStorAgeConfigVo; return coreStorAgeConfigVo;
} }
@@ -71,7 +71,7 @@ export class StorageConfigServiceImplService {
if (ObjectUtil.isNull(storageTypeList.get(storageType))) { if (ObjectUtil.isNull(storageTypeList.get(storageType))) {
throw new AdminException("云存储类型不存在"); throw new AdminException("云存储类型不存在");
} }
if (storageType !== FileEnum.LOCAL.getCode()) { if (storageType !== FileEnum.LOCAL.code) {
const domain: string = storageData.getStr("domain"); const domain: string = storageData.getStr("domain");
if (domain.indexOf("http://") < 0 && domain.indexOf("https://") < 0) { if (domain.indexOf("http://") < 0 && domain.indexOf("https://") < 0) {
throw new AdminException("空间域名请补全http://或https://"); throw new AdminException("空间域名请补全http://或https://");
@@ -108,6 +108,6 @@ export class StorageConfigServiceImplService {
storageConfig.set(storageType, configParams); storageConfig.set(storageType, configParams);
this.coreConfigService.setConfig(this.requestContext.siteId, "STORAGE", storageConfig); this.coreConfigService.config = this.requestContext.siteId, "STORAGE", storageConfig;
} }
} }

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

@@ -22,7 +22,7 @@ export class VerifierServiceImplService {
const limit: number = pageParam.limit; const limit: number = pageParam.limit;
MPJany /* TODO: QueryWrapper<Verifier> */ queryWrapper = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<Verifier> */ queryWrapper = new MPJQueryWrapper();
queryWrapper.setAlias("v").innerJoin("?_member m ON v.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix)); queryWrapper.alias = "v".innerJoin("?_member m ON v.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
queryWrapper.select("v.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg"); queryWrapper.select("v.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg");
queryWrapper.eq("v.site_id", this.requestContext.siteId); queryWrapper.eq("v.site_id", this.requestContext.siteId);
queryWrapper.orderByDesc("id"); queryWrapper.orderByDesc("id");
@@ -35,7 +35,7 @@ export class VerifierServiceImplService {
const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo(); const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo();
Object.assign(memberInfoVo, item); Object.assign(memberInfoVo, item);
vo.setMember(memberInfoVo); vo.member = memberInfoVo;
list.push(vo); list.push(vo);
} }
@@ -47,7 +47,7 @@ export class VerifierServiceImplService {
*/ */
async all(): Promise<any> { async all(): Promise<any> {
MPJany /* TODO: QueryWrapper<Verifier> */ queryWrapper = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<Verifier> */ queryWrapper = new MPJQueryWrapper();
queryWrapper.setAlias("v").innerJoin("?_member m ON v.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix)); queryWrapper.alias = "v".innerJoin("?_member m ON v.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
queryWrapper.select("v.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg"); queryWrapper.select("v.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg");
queryWrapper.eq("v.site_id", this.requestContext.siteId); queryWrapper.eq("v.site_id", this.requestContext.siteId);
queryWrapper.orderByDesc("id"); queryWrapper.orderByDesc("id");
@@ -61,7 +61,7 @@ export class VerifierServiceImplService {
const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo(); const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo();
Object.assign(memberInfoVo, item); Object.assign(memberInfoVo, item);
vo.setMember(memberInfoVo); vo.member = memberInfoVo;
list.push(vo); list.push(vo);
} }
@@ -82,7 +82,7 @@ export class VerifierServiceImplService {
model.siteId = this.requestContext.siteId; model.siteId = this.requestContext.siteId;
model.memberId = addParam.memberId; model.memberId = addParam.memberId;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
model.setVerifyType(JSONUtil.parseArray(addParam.getVerifyType()).toString()); model.verifyType = JSONUtil.parseArray(addParam.verifyType.toString());
this.verifierRepository.save(model); this.verifierRepository.save(model);
} }

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

@@ -21,17 +21,17 @@ export class VerifyServiceImplService {
const limit: number = pageParam.limit; const limit: number = pageParam.limit;
MPJany /* TODO: QueryWrapper<Verify> */ queryWrapper = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<Verify> */ queryWrapper = new MPJQueryWrapper();
queryWrapper.setAlias("v").innerJoin("?_member m ON v.verifier_member_id = m.member_id".replace("?_", this.appConfig.tablePrefix)); queryWrapper.alias = "v".innerJoin("?_member m ON v.verifier_member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
queryWrapper.select("v.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg"); queryWrapper.select("v.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg");
queryWrapper.eq("v.site_id", this.requestContext.siteId); queryWrapper.eq("v.site_id", this.requestContext.siteId);
queryWrapper.orderByDesc("id"); queryWrapper.orderByDesc("id");
if (CommonUtils.isNotEmpty(searchParam.getCode())) queryWrapper.eq("code", searchParam.getCode()); if (CommonUtils.isNotEmpty(searchParam.code)) queryWrapper.eq("code", searchParam.code);
if (CommonUtils.isNotEmpty(searchParam.type)) queryWrapper.eq("type", searchParam.type); if (CommonUtils.isNotEmpty(searchParam.type)) queryWrapper.eq("type", searchParam.type);
if (CommonUtils.isNotEmpty(searchParam.getVerifierMemberId())) queryWrapper.eq("verifier_member_id", searchParam.getVerifierMemberId()); if (CommonUtils.isNotEmpty(searchParam.verifierMemberId)) queryWrapper.eq("verifier_member_id", searchParam.verifierMemberId);
if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper, "v.create_time", searchParam.createTime); if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper, "v.create_time", searchParam.createTime);
if (CommonUtils.isNotEmpty(searchParam.getOrderId())){ if (CommonUtils.isNotEmpty(searchParam.orderId)){
queryWrapper.like("data", searchParam.getOrderId()); queryWrapper.like("data", searchParam.orderId);
} }
[VerifyVo[], number] iPage = verifyMapper.selectJoinPage(new Page<>(page, limit), VerifyVo.class, queryWrapper); [VerifyVo[], number] iPage = verifyMapper.selectJoinPage(new Page<>(page, limit), VerifyVo.class, queryWrapper);
@@ -42,7 +42,7 @@ export class VerifyServiceImplService {
const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo(); const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo();
Object.assign(memberInfoVo, item); Object.assign(memberInfoVo, item);
vo.setMember(memberInfoVo); vo.member = memberInfoVo;
list.push(vo); list.push(vo);
} }
@@ -54,7 +54,7 @@ export class VerifyServiceImplService {
*/ */
async detail(code: string): Promise<any> { async detail(code: string): Promise<any> {
MPJany /* TODO: QueryWrapper<Verify> */ queryWrapper = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<Verify> */ queryWrapper = new MPJQueryWrapper();
queryWrapper.setAlias("v").innerJoin("?_member m ON v.verifier_member_id = m.member_id".replace("?_", this.appConfig.tablePrefix)); queryWrapper.alias = "v".innerJoin("?_member m ON v.verifier_member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
queryWrapper.select("v.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg"); queryWrapper.select("v.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg");
queryWrapper.eq("v.site_id", this.requestContext.siteId); queryWrapper.eq("v.site_id", this.requestContext.siteId);
queryWrapper.eq("v.code", code); queryWrapper.eq("v.code", code);
@@ -67,15 +67,15 @@ export class VerifyServiceImplService {
const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo(); const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo();
Object.assign(memberInfoVo, model); Object.assign(memberInfoVo, model);
vo.setMember(memberInfoVo); vo.member = memberInfoVo;
VerifyInfoEventDefiner.const event: VerifyInfoEvent = new VerifyInfoEventDefiner.VerifyInfoEvent(); VerifyInfoEventDefiner.const event: VerifyInfoEvent = new VerifyInfoEventDefiner.VerifyInfoEvent();
event.data = vo; event.data = vo;
const list: VerifyInfoEventDefiner.VerifyInfoEventResult[] = EventAndSubscribeOfPublisher.publishAndCallback(event); const list: VerifyInfoEventDefiner.VerifyInfoEventResult[] = EventAndSubscribeOfPublisher.publishAndCallback(event);
if (!CollectionUtils.isEmpty(list)){ if (!CollectionUtils.isEmpty(list)){
for (VerifyInfoEventDefiner.VerifyInfoEventResult verifyInfoEventResult : list) { for (VerifyInfoEventDefiner.VerifyInfoEventResult verifyInfoEventResult : list) {
if (verifyInfoEventResult != null && verifyInfoEventResult.getDataMap() != null && !verifyInfoEventResult.getDataMap().isEmpty()){ if (verifyInfoEventResult != null && verifyInfoEventResult.dataMap != null && !verifyInfoEventResult.dataMap.isEmpty()){
vo.setVerifyInfo(verifyInfoEventResult.getDataMap()); vo.verifyInfo = verifyInfoEventResult.dataMap;
break; break;
} }
} }

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

@@ -21,17 +21,17 @@ export class WeappConfigServiceImplService {
const weappConfigVo: WeappConfigVo = this.coreWeappConfigService.getWeappConfig(this.requestContext.siteId); const weappConfigVo: WeappConfigVo = this.coreWeappConfigService.getWeappConfig(this.requestContext.siteId);
weappConfigVo = staticInfo(weappConfigVo); weappConfigVo = staticInfo(weappConfigVo);
if (weappConfigVo.getIsAuthorization() === 1) { if (weappConfigVo.isAuthorization === 1) {
try { try {
const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId); const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId);
const domainResult: WxOpenMaDomainResult = this.wxOpenMaService.getDomain(); const domainResult: WxOpenMaDomainResult = this.wxOpenMaService.domain;
if (domainResult.getErrcode() === "0") { if (domainResult.errcode === "0") {
WeappConfigVo.const domain: Domain = new WeappConfigVo.Domain(); WeappConfigVo.const domain: Domain = new WeappConfigVo.Domain();
domain.setRequestdomain(String.join(";", domainResult.getRequestDomain())); domain.requestdomain = String.join(";", domainResult.requestDomain);
domain.setWsrequestdomain(String.join(";", domainResult.getWsRequestDomain())); domain.wsrequestdomain = String.join(";", domainResult.wsRequestDomain);
domain.setUploaddomain(String.join(";", domainResult.getUploadDomain())); domain.uploaddomain = String.join(";", domainResult.uploadDomain);
domain.setDownloaddomain(String.join(";", domainResult.getDownloadDomain())); domain.downloaddomain = String.join(";", domainResult.downloadDomain);
weappConfigVo.setDomain(domain); weappConfigVo.domain = domain;
} }
} catch (e) { } catch (e) {
} }
@@ -44,7 +44,7 @@ export class WeappConfigServiceImplService {
* setWeappConfig * setWeappConfig
*/ */
async setWeappConfig(weappConfigParam: WeappConfigParam): Promise<any> { async setWeappConfig(weappConfigParam: WeappConfigParam): Promise<any> {
this.coreWeappConfigService.setWeappConfig(this.requestContext.siteId, weappConfigParam); this.coreWeappConfigService.weappConfig = this.requestContext.siteId, weappConfigParam;
} }
/** /**
@@ -55,12 +55,12 @@ export class WeappConfigServiceImplService {
const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId); const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId);
this.wxOpenMaService.modifyDomain( this.wxOpenMaService.modifyDomain(
"set", "set",
CommonUtils.isNotEmpty(param.getRequestdomain()) ? [param.getRequestdomain(].split(";")) : [], CommonUtils.isNotEmpty(param.requestdomain) ? [param.getRequestdomain(].split(";")) : [],
CommonUtils.isNotEmpty(param.getWsrequestdomain())? [param.getWsrequestdomain(].split(";")) : [], CommonUtils.isNotEmpty(param.wsrequestdomain)? [param.getWsrequestdomain(].split(";")) : [],
CommonUtils.isNotEmpty(param.getUploaddomain())? [param.getUploaddomain(].split(";")) : [], CommonUtils.isNotEmpty(param.uploaddomain)? [param.getUploaddomain(].split(";")) : [],
CommonUtils.isNotEmpty(param.getDownloaddomain())? [param.getDownloaddomain(].split(";")) : [], CommonUtils.isNotEmpty(param.downloaddomain)? [param.getDownloaddomain(].split(";")) : [],
CommonUtils.isNotEmpty(param.getTcpdomain())? [param.getTcpdomain(].split(";")) : [], CommonUtils.isNotEmpty(param.tcpdomain)? [param.getTcpdomain(].split(";")) : [],
CommonUtils.isNotEmpty(param.getUdpdomain())? [param.getUdpdomain(].split(";")) : [] CommonUtils.isNotEmpty(param.udpdomain)? [param.getUdpdomain(].split(";")) : []
); );
} catch (e) { } catch (e) {
throw new BadRequestException(e.message); throw new BadRequestException(e.message);
@@ -73,7 +73,7 @@ export class WeappConfigServiceImplService {
async getPrivacySetting(): Promise<any> { async getPrivacySetting(): Promise<any> {
try { try {
const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId); const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId);
return this.wxOpenMaService.getPrivacyService().getPrivacySetting(2); return this.wxOpenMaService.privacyService.getPrivacySetting(2);
} catch (e) { } catch (e) {
throw new BadRequestException(e.message); throw new BadRequestException(e.message);
} }
@@ -86,8 +86,8 @@ export class WeappConfigServiceImplService {
try { try {
const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId); const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId);
const setPrivacySetting: SetPrivacySetting = Object.assign(new SetPrivacySetting(), privacySetting) /* TODO: 检查SetPrivacySetting构造函数 */; const setPrivacySetting: SetPrivacySetting = Object.assign(new SetPrivacySetting(), privacySetting) /* TODO: 检查SetPrivacySetting构造函数 */;
setPrivacySetting.setPrivacyVer(2); setPrivacySetting.privacyVer = 2;
this.wxOpenMaService.getPrivacyService().setPrivacySetting(setPrivacySetting); this.wxOpenMaService.privacyService.privacySetting = setPrivacySetting;
} catch (e) { } catch (e) {
throw new BadRequestException(e.message); throw new BadRequestException(e.message);
} }

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

@@ -20,12 +20,12 @@ export class WeappTemplateServiceImplService {
for (const item of addonNoticeList) { for (const item of addonNoticeList) {
const filter: NoticeInfoVo[] = []; const filter: NoticeInfoVo[] = [];
for (const noticeItem of item.getNotice()) { for (const noticeItem of item.notice) {
if (noticeItem.getSupport_type().indexOf("weapp") != -1) { if (noticeItem.support_type.indexOf("weapp") != -1) {
filter.push(noticeItem); filter.push(noticeItem);
} }
} }
item.setNotice(filter); item.notice = filter;
} }
return addonNoticeList; return addonNoticeList;
} }
@@ -34,15 +34,15 @@ export class WeappTemplateServiceImplService {
* sync * sync
*/ */
async sync(param: WeappTemplateSyncParam): Promise<any> { async sync(param: WeappTemplateSyncParam): Promise<any> {
const list: Record<String, NoticeInfoVo> = this.coreNoticeService.getList(this.requestContext.siteId, param.getKeys()); const list: Record<String, NoticeInfoVo> = this.coreNoticeService.getList(this.requestContext.siteId, param.keys);
const keys: string[] = [param.getKeys(]); const keys: string[] = [param.getKeys(]);
for (const item of list.values()) { for (const item of list.values()) {
if (item.getWeapp() != null && (keys.length == 0 || keys.includes(item.key))) { if (item.weapp != null && (keys.length == 0 || keys.includes(item.key))) {
if (item.getWeappTemplateId().length() > 0) { if (item.weappTemplateId.length() > 0) {
deleteTemplate(item.getWeappTemplateId()); deleteTemplate(item.weappTemplateId);
} }
const templateId: string = addTemplate(item.getWeapp().get("tid").toString(), item.getWeapp().getJSONArray("kid_list").toList(number.class), item.getWeapp().get("scene_desc").toString()); const templateId: string = addTemplate(item.weapp.get("tid").toString(), item.weapp.getJSONArray("kid_list").toList(number.class), item.weapp.get("scene_desc").toString());
this.coreNoticeService.edit(this.requestContext.siteId, item.key, new Record<string, any>().set("weapp_template_id", templateId)); this.coreNoticeService.edit(this.requestContext.siteId, item.key, new Record<string, any>().set("weapp_template_id", templateId));
} }
} }

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

@@ -42,33 +42,33 @@ export class WeappVersionServiceImplService {
if (!RequestUtils.handler().getScheme() === "https") throw new BadRequestException("微信小程序请求地址只支持https请先配置ssl"); if (!RequestUtils.handler().getScheme() === "https") throw new BadRequestException("微信小程序请求地址只支持https请先配置ssl");
const weappConfig: WeappConfigVo = this.coreWeappConfigService.getWeappConfig(this.requestContext.siteId); const weappConfig: WeappConfigVo = this.coreWeappConfigService.getWeappConfig(this.requestContext.siteId);
if (weappConfig.getAppId().isEmpty()) throw new BadRequestException("还没有配置微信小程序"); if (weappConfig.appId.isEmpty()) throw new BadRequestException("还没有配置微信小程序");
if (weappConfig.getUploadPrivateKey().isEmpty()) throw new BadRequestException("还没有配置微信小程序代码上传秘钥"); if (weappConfig.uploadPrivateKey.isEmpty()) throw new BadRequestException("还没有配置微信小程序代码上传秘钥");
const uploading: WeappVersion = this.weappVersionRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_id", this.requestContext.siteId).eq("status", WeappVersionStatusEnum.APPLET_UPLOADING)); const uploading: WeappVersion = this.weappVersionRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_id", this.requestContext.siteId).eq("status", WeappVersionStatusEnum.APPLET_UPLOADING));
if (uploading != null) throw new BadRequestException("小程序有正在上传的版本，请等待上一版本上传完毕后再进行操作"); if (uploading != null) throw new BadRequestException("小程序有正在上传的版本，请等待上一版本上传完毕后再进行操作");
const lastVersion: WeappVersion = this.weappVersionRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_id", this.requestContext.siteId).orderByDesc("version_no").last("limit 1")); 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; const versionNo: number = lastVersion == null ? 1 : lastVersion.versionNo + 1;
const addons: string[] = this.coreSiteService.getAddonKeysBySiteId(this.requestContext.siteId); const addons: string[] = this.coreSiteService.getAddonKeysBySiteId(this.requestContext.siteId);
const uploadParam: WeappUploadParam = new WeappUploadParam(); const uploadParam: WeappUploadParam = new WeappUploadParam();
uploadParam.setBaseUrl(RequestUtils.getDomain(true)); uploadParam.baseUrl = RequestUtils.getDomain(true);
uploadParam.setAppId(weappConfig.getAppId()); uploadParam.appId = weappConfig.appId;
uploadParam.setUploadPrivateKey(weappConfig.getUploadPrivateKey()); uploadParam.uploadPrivateKey = weappConfig.uploadPrivateKey;
uploadParam.siteId = this.requestContext.siteId; uploadParam.siteId = this.requestContext.siteId;
uploadParam.version = "1.0." + versionNo; uploadParam.version = "1.0." + versionNo;
uploadParam.desc = param.desc; uploadParam.desc = param.desc;
uploadParam.setAddon(addons); uploadParam.addon = addons;
const taskKey: string = this.coreWeappCloudService.uploadWeapp(uploadParam); const taskKey: string = this.coreWeappCloudService.uploadWeapp(uploadParam);
const model: WeappVersion = new WeappVersion(); const model: WeappVersion = new WeappVersion();
model.siteId = this.requestContext.siteId; model.siteId = this.requestContext.siteId;
model.version = uploadParam.version; model.version = uploadParam.version;
model.setVersionNo(versionNo); model.versionNo = versionNo;
model.desc = param.desc; model.desc = param.desc;
model.setTaskKey(taskKey); model.taskKey = taskKey;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
this.weappVersionRepository.save(model); this.weappVersionRepository.save(model);
@@ -86,7 +86,7 @@ export class WeappVersionServiceImplService {
if (last.getInt("code", -1).equals(0)) { if (last.getInt("code", -1).equals(0)) {
const model: WeappVersion = new WeappVersion(); const model: WeappVersion = new WeappVersion();
model.status = WeappVersionStatusEnum.APPLET_UPLOAD_FAIL.status; model.status = WeappVersionStatusEnum.APPLET_UPLOAD_FAIL.status;
model.setFailReason(last.getStr("msg", "")); model.failReason = last.getStr("msg", "");
model.updateTime = Date.now( / 1000); model.updateTime = Date.now( / 1000);
this.weappVersionRepository.save(model, /* TODO: any /* TODO: QueryWrapper<WeappVersion> */需改写为TypeORM的where条件对象 */.eq("task_key", key)); this.weappVersionRepository.save(model, /* TODO: any /* TODO: QueryWrapper<WeappVersion> */需改写为TypeORM的where条件对象 */.eq("task_key", key));
@@ -116,14 +116,14 @@ export class WeappVersionServiceImplService {
); );
if (version == null) return ""; if (version == null) return "";
if (version.getFromType() === "cloud_build") { if (version.fromType === "cloud_build") {
return this.coreWeappCloudService.getWeappPreviewImage(); return this.coreWeappCloudService.weappPreviewImage;
} else { } else {
try { try {
const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId); const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId);
const qrcode: string = this.wxOpenMaService.getTestQrcode("", {}); const qrcode: string = this.wxOpenMaService.getTestQrcode("", {});
if (fs.existsSync(qrcode)) { if (fs.existsSync(qrcode)) {
return "data:image/jpeg;base64," + Base64.getEncoder().encodeToString(FileUtils.readFileToByteArray(qrcode)); return "data:image/jpeg;base64," + Base64.encoder.encodeToString(FileUtils.readFileToByteArray(qrcode));
} }
return ""; return "";
} catch (e) { } catch (e) {

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

@@ -22,7 +22,7 @@ export class WechatConfigServiceImplService {
* setWechatConfig * setWechatConfig
*/ */
async setWechatConfig(wechatConfigParam: WechatConfigParam): Promise<any> { async setWechatConfig(wechatConfigParam: WechatConfigParam): Promise<any> {
this.coreWechatConfigService.setWechatConfig(this.requestContext.siteId, wechatConfigParam); this.coreWechatConfigService.wechatConfig = this.requestContext.siteId, wechatConfigParam;
} }
/** /**
@@ -33,11 +33,11 @@ export class WechatConfigServiceImplService {
const request: HttpServletRequest = RequestUtils.handler(); const request: HttpServletRequest = RequestUtils.handler();
const vo: WechatStaticInfoVo = new WechatStaticInfoVo(); const vo: WechatStaticInfoVo = new WechatStaticInfoVo();
vo.setServeUrl(request.getScheme() + "://" + request.getServerName() + "/api/wechat/serve/" + this.requestContext.siteId); vo.serveUrl = request.scheme + "://" + request.serverName + "/api/wechat/serve/" + this.requestContext.siteId;
vo.setBusinessDomain(sysUrl.getWapDomain()); vo.businessDomain = sysUrl.wapDomain;
vo.setJsSecureDomain(sysUrl.getWapDomain()); vo.jsSecureDomain = sysUrl.wapDomain;
vo.setWebAuthDomain(sysUrl.getWapDomain()); vo.webAuthDomain = sysUrl.wapDomain;
vo.setEncryptionType(WechatEncryptionTypeEnum.getMap()); vo.encryptionType = WechatEncryptionTypeEnum.map;
return vo; return vo;
} }

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

@@ -43,15 +43,15 @@ export class WechatMediaServiceImplService {
async image(file: MultipartFile): Promise<any> { async image(file: MultipartFile): Promise<any> {
const param: AttachmentUploadParam = new AttachmentUploadParam(); const param: AttachmentUploadParam = new AttachmentUploadParam();
param.siteId = this.requestContext.siteId; param.siteId = this.requestContext.siteId;
param.setStorageType("local"); param.storageType = "local";
param.setFile(file); param.file = file;
param.setAttType("image"); param.attType = "image";
param.setDir("attachment/image/" + param.siteId + "/" + (new SimpleDateFormat("yyyyMM/dd").format(new Date())) + "/"); param.dir = "attachment/image/" + param.siteId + "/" + (new SimpleDateFormat("yyyyMM/dd".format(new Date())) + "/");
const uploadRes: AttachmentUploadVo = this.coreUploadService.upload(param); const uploadRes: AttachmentUploadVo = this.coreUploadService.upload(param);
const wxMaterial: WxMpMaterial = new WxMpMaterial(); const wxMaterial: WxMpMaterial = new WxMpMaterial();
wxMaterial.setFile(this.appConfig.webRootDownResource + uploadRes.url); wxMaterial.file = this.appConfig.webRootDownResource + uploadRes.url;
wxMaterial.name = param.getNewFilename(); wxMaterial.name = param.newFilename;
try { try {
const res: WxMpMaterialUploadResult = WechatUtils.mp(this.requestContext.siteId).getMaterialService().materialFileUpload(WechatMediaTypeEnum.IMAGE.type, wxMaterial); const res: WxMpMaterialUploadResult = WechatUtils.mp(this.requestContext.siteId).getMaterialService().materialFileUpload(WechatMediaTypeEnum.IMAGE.type, wxMaterial);
@@ -60,7 +60,7 @@ export class WechatMediaServiceImplService {
model.siteId = this.requestContext.siteId; model.siteId = this.requestContext.siteId;
model.type = WechatMediaTypeEnum.IMAGE.type; model.type = WechatMediaTypeEnum.IMAGE.type;
model.value = uploadRes.url; model.value = uploadRes.url;
model.setMediaId(res.getMediaId()); model.mediaId = res.mediaId;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
this.wechatMediaRepository.save(model); this.wechatMediaRepository.save(model);
@@ -78,17 +78,17 @@ export class WechatMediaServiceImplService {
async video(file: MultipartFile): Promise<any> { async video(file: MultipartFile): Promise<any> {
const param: AttachmentUploadParam = new AttachmentUploadParam(); const param: AttachmentUploadParam = new AttachmentUploadParam();
param.siteId = this.requestContext.siteId; param.siteId = this.requestContext.siteId;
param.setStorageType("local"); param.storageType = "local";
param.setFile(file); param.file = file;
param.setAttType("video"); param.attType = "video";
param.setDir("attachment/video/" + param.siteId + "/" + (new SimpleDateFormat("yyyyMM/dd").format(new Date())) + "/"); param.dir = "attachment/video/" + param.siteId + "/" + (new SimpleDateFormat("yyyyMM/dd".format(new Date())) + "/");
const uploadRes: AttachmentUploadVo = this.coreUploadService.upload(param); const uploadRes: AttachmentUploadVo = this.coreUploadService.upload(param);
const wxMaterial: WxMpMaterial = new WxMpMaterial(); const wxMaterial: WxMpMaterial = new WxMpMaterial();
wxMaterial.setFile(this.appConfig.webRootDownResource + uploadRes.url); wxMaterial.file = this.appConfig.webRootDownResource + uploadRes.url;
wxMaterial.name = param.getNewFilename(); wxMaterial.name = param.newFilename;
wxMaterial.setVideoIntroduction((new SimpleDateFormat("yyyyMM/dd").format(new Date())) + "上传"); wxMaterial.videoIntroduction = (new SimpleDateFormat("yyyyMM/dd".format(new Date())) + "上传");
wxMaterial.setVideoTitle(param.getNewFilename()); wxMaterial.videoTitle = param.newFilename;
try { try {
const res: WxMpMaterialUploadResult = WechatUtils.mp(this.requestContext.siteId).getMaterialService().materialFileUpload(WechatMediaTypeEnum.VIDEO.type, wxMaterial); const res: WxMpMaterialUploadResult = WechatUtils.mp(this.requestContext.siteId).getMaterialService().materialFileUpload(WechatMediaTypeEnum.VIDEO.type, wxMaterial);
@@ -97,7 +97,7 @@ export class WechatMediaServiceImplService {
model.siteId = this.requestContext.siteId; model.siteId = this.requestContext.siteId;
model.type = WechatMediaTypeEnum.VIDEO.type; model.type = WechatMediaTypeEnum.VIDEO.type;
model.value = uploadRes.url; model.value = uploadRes.url;
model.setMediaId(res.getMediaId()); model.mediaId = res.mediaId;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
this.wechatMediaRepository.save(model); this.wechatMediaRepository.save(model);
@@ -117,26 +117,26 @@ export class WechatMediaServiceImplService {
const count: number = 20; const count: number = 20;
const result: WxMpMaterialNewsBatchGetResult = WechatUtils.mp(this.requestContext.siteId).getMaterialService().materialNewsBatchGet(offset, count); const result: WxMpMaterialNewsBatchGetResult = WechatUtils.mp(this.requestContext.siteId).getMaterialService().materialNewsBatchGet(offset, count);
if (result.getItemCount() > 0) { if (result.itemCount > 0) {
for (WxMpMaterialNewsBatchGetResult.WxMaterialNewsBatchGetNewsItem item: result.getItems()) { for (WxMpMaterialNewsBatchGetResult.WxMaterialNewsBatchGetNewsItem item: result.items) {
const media: WechatMedia = this.wechatMediaRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("media_id", item.getMediaId())); const media: WechatMedia = this.wechatMediaRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("media_id", item.mediaId));
if (CommonUtils.isNotEmpty(media)) { if (CommonUtils.isNotEmpty(media)) {
media.value = JSONUtil.toJsonStr(item.getContent()); media.value = JSONUtil.toJsonStr(item.content);
media.updateTime = Date.now( / 1000); media.updateTime = Date.now( / 1000);
wechatMediaMapper.updateById(media); wechatMediaMapper.updateById(media);
} else { } else {
const model: WechatMedia = new WechatMedia(); const model: WechatMedia = new WechatMedia();
model.siteId = this.requestContext.siteId; model.siteId = this.requestContext.siteId;
model.type = WechatMediaTypeEnum.VIDEO.type; model.type = WechatMediaTypeEnum.VIDEO.type;
model.value = JSONUtil.toJsonStr(item.getContent()); model.value = JSONUtil.toJsonStr(item.content);
model.setMediaId(item.getMediaId()); model.mediaId = item.mediaId;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
this.wechatMediaRepository.save(model); this.wechatMediaRepository.save(model);
} }
} }
} }
if (offset < Math.ceil(result.getTotalCount() / count)) { if (offset < Math.ceil(result.totalCount / count)) {
offset++; offset++;
this.syncNews(offset); this.syncNews(offset);
} }

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

@@ -26,7 +26,7 @@ export class WechatMenuServiceImplService {
const params: Record<String , JSONArray> = {}; const params: Record<String , JSONArray> = {};
params.put("button", data); params.put("button", data);
WechatUtils.mp(this.requestContext.siteId).getMenuService().menuCreate(JsonUtils.parseObject<any>(params).toString()) ; WechatUtils.mp(this.requestContext.siteId).getMenuService().menuCreate(JsonUtils.parseObject<any>(params).toString()) ;
this.coreConfigService.setConfig(this.requestContext.siteId, "WECHAT_MENU", data); this.coreConfigService.config = this.requestContext.siteId, "WECHAT_MENU", data;
}catch (e){ }catch (e){
throw new AdminException(e.message); throw new AdminException(e.message);
} }

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

@@ -63,13 +63,13 @@ export class WechatReplyServiceImplService {
const model: WechatReply = new WechatReply(); const model: WechatReply = new WechatReply();
model.name = path.basename(addParam); model.name = path.basename(addParam);
model.siteId = this.requestContext.siteId; model.siteId = this.requestContext.siteId;
model.setKeyword(addParam.keyword); model.keyword = addParam.keyword;
model.setReplyType(WechatReplyTypeEnum.REPLY_KEYWORD.type); model.replyType = WechatReplyTypeEnum.REPLY_KEYWORD.type;
model.setMatchingType(addParam.getMatchingType()); model.matchingType = addParam.matchingType;
model.setContent(addParam.getContent().toString()); model.content = addParam.content.toString();
model.setSort(addParam.getSort()); model.sort = addParam.sort;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
model.setReplyMethod(addParam.getReplyMethod()); model.replyMethod = addParam.replyMethod;
this.wechatReplyRepository.save(model); this.wechatReplyRepository.save(model);
} }
@@ -84,12 +84,12 @@ export class WechatReplyServiceImplService {
if (!model) throw new BadRequestException("数据不存在!"); if (!model) throw new BadRequestException("数据不存在!");
model.name = path.basename(editParam); model.name = path.basename(editParam);
model.setKeyword(editParam.keyword); model.keyword = editParam.keyword;
model.setMatchingType(editParam.getMatchingType()); model.matchingType = editParam.matchingType;
model.setContent(editParam.getContent().toString()); model.content = editParam.content.toString();
model.setSort(editParam.getSort()); model.sort = editParam.sort;
model.updateTime = Date.now( / 1000); model.updateTime = Date.now( / 1000);
model.setReplyMethod(editParam.getReplyMethod()); model.replyMethod = editParam.replyMethod;
wechatReplyMapper.updateById(model); wechatReplyMapper.updateById(model);
} }
@@ -112,13 +112,13 @@ export class WechatReplyServiceImplService {
if (CommonUtils.isEmpty(reply)) { if (CommonUtils.isEmpty(reply)) {
const model: WechatReply = new WechatReply(); const model: WechatReply = new WechatReply();
model.setContent(param.getContent().toString()); model.content = param.content.toString();
model.siteId = this.requestContext.siteId; model.siteId = this.requestContext.siteId;
model.setReplyType(WechatReplyTypeEnum.REPLY_DEFAULT.type); model.replyType = WechatReplyTypeEnum.REPLY_DEFAULT.type;
this.wechatReplyRepository.save(model); this.wechatReplyRepository.save(model);
} else { } else {
const model: WechatReply = new WechatReply(); const model: WechatReply = new WechatReply();
model.setContent(param.getContent().toString()); model.content = param.content.toString();
this.wechatReplyRepository.save(model, queryWrapper); this.wechatReplyRepository.save(model, queryWrapper);
} }
} }
@@ -142,13 +142,13 @@ export class WechatReplyServiceImplService {
if (CommonUtils.isEmpty(reply)) { if (CommonUtils.isEmpty(reply)) {
const model: WechatReply = new WechatReply(); const model: WechatReply = new WechatReply();
model.setContent(param.getContent().toString()); model.content = param.content.toString();
model.siteId = this.requestContext.siteId; model.siteId = this.requestContext.siteId;
model.setReplyType(WechatReplyTypeEnum.REPLY_DEFAULT.type); model.replyType = WechatReplyTypeEnum.REPLY_DEFAULT.type;
this.wechatReplyRepository.save(model); this.wechatReplyRepository.save(model);
} else { } else {
const model: WechatReply = new WechatReply(); const model: WechatReply = new WechatReply();
model.setContent(param.getContent().toString()); model.content = param.content.toString();
this.wechatReplyRepository.save(model, queryWrapper); this.wechatReplyRepository.save(model, queryWrapper);
} }
} }

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

@@ -20,12 +20,12 @@ export class WechatTemplateServiceImplService {
for (const item of addonNoticeList) { for (const item of addonNoticeList) {
const filter: NoticeInfoVo[] = []; const filter: NoticeInfoVo[] = [];
for (const noticeItem of item.getNotice()) { for (const noticeItem of item.notice) {
if (noticeItem.getSupport_type().indexOf("wechat") != -1) { if (noticeItem.support_type.indexOf("wechat") != -1) {
filter.push(noticeItem); filter.push(noticeItem);
} }
} }
item.setNotice(filter); item.notice = filter;
} }
return addonNoticeList; return addonNoticeList;
} }
@@ -34,15 +34,15 @@ export class WechatTemplateServiceImplService {
* sync * sync
*/ */
async sync(param: WechatTemplateSyncParam): Promise<any> { async sync(param: WechatTemplateSyncParam): Promise<any> {
const list: Record<String, NoticeInfoVo> = this.coreNoticeService.getList(this.requestContext.siteId, param.getKeys()); const list: Record<String, NoticeInfoVo> = this.coreNoticeService.getList(this.requestContext.siteId, param.keys);
const keys: string[] = [param.getKeys(]); const keys: string[] = [param.getKeys(]);
for (const item of list.values()) { for (const item of list.values()) {
if (item.getWechat() != null && (keys.length == 0 || keys.includes(item.key))) { if (item.wechat != null && (keys.length == 0 || keys.includes(item.key))) {
if (item.getWeappTemplateId().length() > 0) { if (item.weappTemplateId.length() > 0) {
deleteTemplate(item.getWeappTemplateId()); deleteTemplate(item.weappTemplateId);
} }
const templateId: string = addTemplate(item.getWechat().get("temp_key").toString(), item.getWechat().getJSONArray("keyword_name_list").toList(String.class)); const templateId: string = addTemplate(item.wechat.get("temp_key").toString(), item.wechat.getJSONArray("keyword_name_list").toList(String.class));
this.coreNoticeService.edit(this.requestContext.siteId, item.key, new Record<string, any>().set("wechat_template_id", templateId)); this.coreNoticeService.edit(this.requestContext.siteId, item.key, new Record<string, any>().set("wechat_template_id", templateId));
} }
} }

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

@@ -15,7 +15,7 @@ export class OplatformConfigServiceImplService {
* getOplatformStaticInfo * getOplatformStaticInfo
*/ */
async getOplatformStaticInfo(): Promise<any> { async getOplatformStaticInfo(): Promise<any> {
return this.coreOplatformConfigService.getOplatformStaticInfo(); return this.coreOplatformConfigService.oplatformStaticInfo;
} }
/** /**
@@ -37,6 +37,6 @@ export class OplatformConfigServiceImplService {
* setWxOplatformConfig * setWxOplatformConfig
*/ */
async setWxOplatformConfig(oplatformConfigParam: OplatformConfigParam): Promise<any> { async setWxOplatformConfig(oplatformConfigParam: OplatformConfigParam): Promise<any> {
this.coreOplatformConfigService.setOplatformConfig(oplatformConfigParam); this.coreOplatformConfigService.oplatformConfig = oplatformConfigParam;
} }
} }

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

@@ -16,27 +16,27 @@ export class OplatformServerServiceImplService {
*/ */
async server(param: OplatformServerParam): Promise<any> { async server(param: OplatformServerParam): Promise<any> {
if (!StringUtils.toLowerCase() === "aes", param.getEncryptType(.toLowerCase()) if (!StringUtils.toLowerCase() === "aes", param.getEncryptType(.toLowerCase())
|| !WechatUtils.WxOpen().getWxOpenComponentService().checkSignature(param.getTimestamp(), param.getNonce(), param.getSignature())) { || !WechatUtils.WxOpen().getWxOpenComponentService().checkSignature(param.timestamp, param.nonce, param.signature)) {
throw new IllegalArgumentException("非法请求"); throw new IllegalArgumentException("非法请求");
} }
const inMessage: WxOpenXmlMessage = WxOpenXmlMessage.fromEncryptedXml(param.getRequestBody(), WechatUtils.WxOpen().getWxOpenConfigStorage(), param.getTimestamp(), param.getNonce(), param.getMsgSignature()); const inMessage: WxOpenXmlMessage = WxOpenXmlMessage.fromEncryptedXml(param.requestBody, WechatUtils.WxOpen().getWxOpenConfigStorage(), param.timestamp, param.nonce, param.msgSignature);
log.info("开放平台授权事件推送消息：{}", inMessage); log.info("开放平台授权事件推送消息：{}", inMessage);
try { try {
WechatUtils.WxOpen().getWxOpenComponentService().route(inMessage); WechatUtils.WxOpen().getWxOpenComponentService().route(inMessage);
// 授权取消 // 授权取消
if (inMessage.getInfoType() === "unauthorized") { if (inMessage.infoType === "unauthorized") {
this.oplatformService.clearAuthorization(inMessage.getAuthorizerAppid()); this.oplatformService.clearAuthorization(inMessage.authorizerAppid);
} }
// 更新授权 // 更新授权
if (inMessage.getInfoType() === "updateauthorized") { if (inMessage.infoType === "updateauthorized") {
const siteId: number = this.coreOplatformService.getSiteIdByAuthorizerAppid(inMessage.getAuthorizerAppid()); const siteId: number = this.coreOplatformService.getSiteIdByAuthorizerAppid(inMessage.authorizerAppid);
RequestUtils.siteId = siteId; RequestUtils.siteId = siteId;
const authorizationParam: AuthorizationParam = new AuthorizationParam(); const authorizationParam: AuthorizationParam = new AuthorizationParam();
authorizationParam.setAuthCode(inMessage.getAuthorizationCode()); authorizationParam.authCode = inMessage.authorizationCode;
this.oplatformService.authorization(authorizationParam); this.oplatformService.authorization(authorizationParam);
} }
} catch (e) { } catch (e) {
@@ -49,20 +49,20 @@ export class OplatformServerServiceImplService {
*/ */
async message(appid: string, param: OplatformServerParam): Promise<any> { async message(appid: string, param: OplatformServerParam): Promise<any> {
if (!StringUtils.toLowerCase() === "aes", param.getEncryptType(.toLowerCase()) if (!StringUtils.toLowerCase() === "aes", param.getEncryptType(.toLowerCase())
|| !WechatUtils.WxOpen().getWxOpenComponentService().checkSignature(param.getTimestamp(), param.getNonce(), param.getSignature())) { || !WechatUtils.WxOpen().getWxOpenComponentService().checkSignature(param.timestamp, param.nonce, param.signature)) {
throw new IllegalArgumentException("非法请求"); throw new IllegalArgumentException("非法请求");
} }
const inMessage: WxMpXmlMessage = WxOpenXmlMessage.fromEncryptedMpXml(param.getRequestBody(), WechatUtils.WxOpen().getWxOpenConfigStorage(), param.getTimestamp(), param.getNonce(), param.getMsgSignature()); const inMessage: WxMpXmlMessage = WxOpenXmlMessage.fromEncryptedMpXml(param.requestBody, WechatUtils.WxOpen().getWxOpenConfigStorage(), param.timestamp, param.nonce, param.msgSignature);
log.info("开放平台消息与事件推送消息：{}", inMessage); log.info("开放平台消息与事件推送消息：{}", inMessage);
if (inMessage.getMsgType() === WxConsts.XmlMsgType.EVENT) { if (inMessage.msgType === WxConsts.XmlMsgType.EVENT) {
// 小程序审核成功 // 小程序审核成功
if (inMessage.getEvent() === WxConsts.EventType.WEAPP_AUDIT_SUCCESS) { if (inMessage.event === WxConsts.EventType.WEAPP_AUDIT_SUCCESS) {
weappAuditSuccess(inMessage); weappAuditSuccess(inMessage);
} }
// 小程序审核失败 // 小程序审核失败
if (inMessage.getEvent() === WxConsts.EventType.WEAPP_AUDIT_FAIL) { if (inMessage.event === WxConsts.EventType.WEAPP_AUDIT_FAIL) {
weappAuditFail(inMessage); weappAuditFail(inMessage);
} }
} }

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

@@ -33,39 +33,39 @@ export class OplatformServiceImplService {
*/ */
async authorization(param: AuthorizationParam): Promise<any> { async authorization(param: AuthorizationParam): Promise<any> {
try { try {
const queryAuth: WxOpenQueryAuthResult = WechatUtils.WxOpen().getWxOpenComponentService().getQueryAuth(param.getAuthCode()); const queryAuth: WxOpenQueryAuthResult = WechatUtils.WxOpen().getWxOpenComponentService().getQueryAuth(param.authCode);
// 授权账号信息 授权信息 // 授权账号信息 授权信息
const result: WxOpenAuthorizerInfoResult = WechatUtils.WxOpen().getWxOpenComponentService().getAuthorizerInfo(queryAuth.getAuthorizationInfo().getAuthorizerAppid()); const result: WxOpenAuthorizerInfoResult = WechatUtils.WxOpen().getWxOpenComponentService().getAuthorizerInfo(queryAuth.authorizationInfo.getAuthorizerAppid());
const authorizerInfo: WxOpenAuthorizerInfo = result.getAuthorizerInfo(); const authorizerInfo: WxOpenAuthorizerInfo = result.authorizerInfo;
const authorization: WxOpenAuthorizationInfo = result.getAuthorizationInfo(); const authorization: WxOpenAuthorizationInfo = result.authorizationInfo;
// 小程序 // 小程序
if (CommonUtils.isNotEmpty(authorizerInfo.getMiniProgramInfo())) { if (CommonUtils.isNotEmpty(authorizerInfo.miniProgramInfo)) {
this.weappCheck(authorizerInfo, authorization); this.weappCheck(authorizerInfo, authorization);
const weappConfig: WeappConfigParam = new WeappConfigParam(); const weappConfig: WeappConfigParam = new WeappConfigParam();
weappConfig.setAppId(authorization.getAuthorizerAppid()); weappConfig.appId = authorization.authorizerAppid;
weappConfig.setWeappName(authorizerInfo.getNickName()); weappConfig.weappName = authorizerInfo.nickName;
weappConfig.setWeappOriginal(authorizerInfo.getUserName()); weappConfig.weappOriginal = authorizerInfo.userName;
weappConfig.setIsAuthorization(1); weappConfig.isAuthorization = 1;
weappConfig.setQrCode(this.coreFetchService.image(authorizerInfo.getQrcodeUrl(), this.requestContext.siteId)); weappConfig.qrCode = this.coreFetchService.image(authorizerInfo.qrcodeUrl, this.requestContext.siteId);
this.coreWeappConfigService.setWeappConfig(this.requestContext.siteId, weappConfig); this.coreWeappConfigService.weappConfig = this.requestContext.siteId, weappConfig;
this.coreWeappConfigService.setWeappAuthorizationInfo(this.requestContext.siteId, result); this.coreWeappConfigService.weappAuthorizationInfo = this.requestContext.siteId, result;
} else { // 公众号 } else { // 公众号
this.wechatCheck(authorizerInfo, authorization); this.wechatCheck(authorizerInfo, authorization);
const wechatConfig: WechatConfigParam = new WechatConfigParam(); const wechatConfig: WechatConfigParam = new WechatConfigParam();
wechatConfig.setAppId(authorization.getAuthorizerAppid()); wechatConfig.appId = authorization.authorizerAppid;
wechatConfig.setWechatName(authorizerInfo.getNickName()); wechatConfig.wechatName = authorizerInfo.nickName;
wechatConfig.setWechatOriginal(authorizerInfo.getUserName()); wechatConfig.wechatOriginal = authorizerInfo.userName;
wechatConfig.setIsAuthorization(1); wechatConfig.isAuthorization = 1;
wechatConfig.setQrcode(this.coreFetchService.image(authorizerInfo.getQrcodeUrl(), this.requestContext.siteId)); wechatConfig.qrcode = this.coreFetchService.image(authorizerInfo.qrcodeUrl, this.requestContext.siteId);
this.coreWechatConfigService.setWechatConfig(this.requestContext.siteId, wechatConfig); this.coreWechatConfigService.wechatConfig = this.requestContext.siteId, wechatConfig;
this.coreWechatConfigService.setWechatAuthorizationInfo(this.requestContext.siteId, result); this.coreWechatConfigService.wechatAuthorizationInfo = this.requestContext.siteId, result;
} }
} catch (e) { } catch (e) {
throw new BadRequestException(e.message); throw new BadRequestException(e.message);
@@ -102,8 +102,8 @@ export class OplatformServiceImplService {
Object.assign(vo, item); Object.assign(vo, item);
vo.value = JsonUtils.parseObject<any>(item.value); vo.value = JsonUtils.parseObject<any>(item.value);
const siteInfo: Site = new Site(); const siteInfo: Site = new Site();
siteInfo.setSiteName(item.getSiteName()); siteInfo.siteName = item.siteName;
vo.setSite(siteInfo); vo.site = siteInfo;
listInfo.push(vo); listInfo.push(vo);
} }
return PageResult.build(page, limit, iPageTotal).setData(listInfo); return PageResult.build(page, limit, iPageTotal).setData(listInfo);

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

@@ -74,32 +74,32 @@ export class WeappVersionServiceImplService {
if (uploading != null) throw new BadRequestException("小程序有正在上传的版本，请等待上一版本上传完毕后再进行操作"); if (uploading != null) throw new BadRequestException("小程序有正在上传的版本，请等待上一版本上传完毕后再进行操作");
const lastVersion: WxOplatfromWeappVersion = this.wxOplatfromWeappVersionRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) const lastVersion: WxOplatfromWeappVersion = this.wxOplatfromWeappVersionRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
.eq("site_group_id", siteGroup.getGroupId()) .eq("site_group_id", siteGroup.groupId)
.orderByDesc("id") .orderByDesc("id")
.last("limit 1") .last("limit 1")
); );
const config: OplatformConfigVo = this.coreOplatformConfigService.getWxOplatformConfig(); const config: OplatformConfigVo = this.coreOplatformConfigService.wxOplatformConfig;
const addon: string[] = CollUtil.newArrayList(); const addon: string[] = CollUtil.newArrayList();
if (!siteGroup.getApp().isEmpty()) CollUtil.addAll(addon, JSONUtil.parseArray(siteGroup.getApp())); if (!siteGroup.app.isEmpty()) CollUtil.addAll(addon, JSONUtil.parseArray(siteGroup.app));
if (!siteGroup.getAddon().isEmpty()) CollUtil.addAll(addon, JSONUtil.parseArray(siteGroup.getAddon())); if (!siteGroup.addon.isEmpty()) CollUtil.addAll(addon, JSONUtil.parseArray(siteGroup.addon));
const weappUploadParam: WeappUploadParam = new WeappUploadParam(); const weappUploadParam: WeappUploadParam = new WeappUploadParam();
weappUploadParam.setAppId(config.getDevelopAppId()); weappUploadParam.appId = config.developAppId;
weappUploadParam.setBaseUrl(RequestUtils.getDomain(true)); weappUploadParam.baseUrl = RequestUtils.getDomain(true);
weappUploadParam.siteId = 0; weappUploadParam.siteId = 0;
weappUploadParam.version = "1." + siteGroup.getGroupId( + "." + (lastVersion == null ? 1 : lastVersion.getVersionNo() + 1)); weappUploadParam.version = "1." + siteGroup.groupId + "." + (lastVersion == null ? 1 : lastVersion.versionNo + 1);
weappUploadParam.setUploadPrivateKey(config.getDevelopUploadPrivateKey()); weappUploadParam.uploadPrivateKey = config.developUploadPrivateKey;
weappUploadParam.setAddon(addon); weappUploadParam.addon = addon;
const taskKey: string = this.coreWeappCloudService.uploadWeapp(weappUploadParam); const taskKey: string = this.coreWeappCloudService.uploadWeapp(weappUploadParam);
const model: WxOplatfromWeappVersion = new WxOplatfromWeappVersion(); const model: WxOplatfromWeappVersion = new WxOplatfromWeappVersion();
model.setSiteGroupId(siteGroup.getGroupId()); model.siteGroupId = siteGroup.groupId;
model.setUserVersion(weappUploadParam.version); model.userVersion = weappUploadParam.version;
model.setVersionNo(lastVersion == null ? 1 : lastVersion.getVersionNo() + 1); model.versionNo = lastVersion == null ? 1 : lastVersion.versionNo + 1;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
model.setTaskKey(taskKey); model.taskKey = taskKey;
this.wxOplatfromWeappVersionRepository.save(model); this.wxOplatfromWeappVersionRepository.save(model);
this.weappVersionService.getVersionUploadResult(taskKey, isAll); this.weappVersionService.getVersionUploadResult(taskKey, isAll);
@@ -124,28 +124,28 @@ export class WeappVersionServiceImplService {
const wxOpenService: WxOpenComponentService = WechatUtils.WxOpen().getWxOpenComponentService(); const wxOpenService: WxOpenComponentService = WechatUtils.WxOpen().getWxOpenComponentService();
try { try {
const draftList: WxOpenMaCodeTemplate[] = this.wxOpenService.getTemplateDraftList(); const draftList: WxOpenMaCodeTemplate[] = this.wxOpenService.templateDraftList;
if (CommonUtils.isNotEmpty(draftList)) { if (CommonUtils.isNotEmpty(draftList)) {
for (const item of draftList) { for (const item of draftList) {
if (item.getUserVersion() === version.getUserVersion()) { if (item.userVersion === version.userVersion) {
// 添加模板 // 添加模板
this.wxOpenService.addToTemplate(item.getDraftId()); this.wxOpenService.addToTemplate(item.draftId);
const templateList: WxOpenMaCodeTemplate[] = this.wxOpenService.getTemplateList(); const templateList: WxOpenMaCodeTemplate[] = this.wxOpenService.templateList;
for (const template of templateList) { for (const template of templateList) {
if (template.getUserVersion() === version.getUserVersion()) { if (template.userVersion === version.userVersion) {
version.setTemplateId(template.getTemplateId().toString()); version.templateId = template.templateId.toString();
wxOplatfromWeappVersionMapper.updateById(version); wxOplatfromWeappVersionMapper.updateById(version);
// 删除之前的模板 // 删除之前的模板
const prev: WxOplatfromWeappVersion = this.wxOplatfromWeappVersionRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) const prev: WxOplatfromWeappVersion = this.wxOplatfromWeappVersionRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
.eq("site_group_id", version.getSiteGroupId()) .eq("site_group_id", version.siteGroupId)
.lt("id", version.id) .lt("id", version.id)
.orderByDesc("id") .orderByDesc("id")
.last("limit 1") .last("limit 1")
); );
if (prev!= null) { if (prev!= null) {
this.wxOpenService.deleteTemplate(number.valueOf(prev.getTemplateId())); this.wxOpenService.deleteTemplate(number.valueOf(prev.templateId));
} }
break; break;
} }
@@ -160,12 +160,12 @@ export class WeappVersionServiceImplService {
if (isAll) { if (isAll) {
const siteGroup: SiteGroup = this.siteGroupRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) const siteGroup: SiteGroup = this.siteGroupRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
.gt("group_id", version.getSiteGroupId()) .gt("group_id", version.siteGroupId)
.orderByDesc("group_id") .orderByDesc("group_id")
.last("limit 1") .last("limit 1")
); );
if (siteGroup != null) { if (siteGroup != null) {
this.weappVersionService.push(siteGroup.getGroupId(), true); this.weappVersionService.push(siteGroup.groupId, true);
} }
} }
} }
@@ -189,25 +189,25 @@ export class WeappVersionServiceImplService {
try { try {
const extJson: Record<string, any> = new Record<string, any>(); const extJson: Record<string, any> = new Record<string, any>();
extJson.set("extAppid", weappCofig.getAppId()); extJson.set("extAppid", weappCofig.appId);
extJson.set("entryPagePath", "app/pages/index/index"); extJson.set("entryPagePath", "app/pages/index/index");
extJson.set("directCommit", true); extJson.set("directCommit", true);
extJson.putByPath("ext.site_id", siteId); extJson.putByPath("ext.site_id", siteId);
const commitResult: WxOpenResult = WechatUtils.WxOpen().getWxOpenComponentService() const commitResult: WxOpenResult = WechatUtils.WxOpen().getWxOpenComponentService()
.getWxMaServiceByAppid(weappCofig.getAppId()) .getWxMaServiceByAppid(weappCofig.appId)
.codeCommit(number.valueOf(version.getTemplateId()), version.getUserVersion(), version.getUserDesc(), extJson); .codeCommit(number.valueOf(version.templateId), version.userVersion, version.userDesc, extJson);
if (!commitResult.getErrcode() === "0") throw new BadRequestException(commitResult.getErrmsg()); if (!commitResult.errcode === "0") throw new BadRequestException(commitResult.errmsg);
const model: WeappVersion = new WeappVersion(); const model: WeappVersion = new WeappVersion();
model.siteId = siteId; model.siteId = siteId;
model.version = version.getUserVersion(); model.version = version.userVersion;
model.setVersionNo(version.getVersionNo()); model.versionNo = version.versionNo;
model.desc = version.getUserDesc(); model.desc = version.userDesc;
model.status = WeappVersionStatusEnum.APPLET_AUDITING.status; model.status = WeappVersionStatusEnum.APPLET_AUDITING.status;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
model.setFromType("open_platform"); model.fromType = "open_platform";
this.weappVersionRepository.save(model); this.weappVersionRepository.save(model);
// 提交审核 // 提交审核
@@ -228,10 +228,10 @@ export class WeappVersionServiceImplService {
try { try {
const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(siteId); const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(siteId);
const privacyInfo: WxOpenMaGetCodePrivacyInfoResult = this.wxOpenMaService.getCodePrivacyInfo(); const privacyInfo: WxOpenMaGetCodePrivacyInfoResult = this.wxOpenMaService.codePrivacyInfo;
if (!privacyInfo.getErrcode() === "0") { if (!privacyInfo.errcode === "0") {
version.status = WeappVersionStatusEnum.APPLET_AUDIT_FAIL.status; version.status = WeappVersionStatusEnum.APPLET_AUDIT_FAIL.status;
version.setFailReason(privacyInfo.getErrmsg()); version.failReason = privacyInfo.errmsg;
version.updateTime = Date.now( / 1000); version.updateTime = Date.now( / 1000);
weappVersionMapper.updateById(version); weappVersionMapper.updateById(version);
return; return;
@@ -240,10 +240,10 @@ export class WeappVersionServiceImplService {
const submitAuditMessage: WxOpenMaSubmitAuditMessage = new WxOpenMaSubmitAuditMessage(); const submitAuditMessage: WxOpenMaSubmitAuditMessage = new WxOpenMaSubmitAuditMessage();
const submitResult: WxOpenMaSubmitAuditResult = this.wxOpenMaService.submitAudit(submitAuditMessage); const submitResult: WxOpenMaSubmitAuditResult = this.wxOpenMaService.submitAudit(submitAuditMessage);
version.status = submitResult.getErrcode( === "0" ? WeappVersionStatusEnum.APPLET_AUDITING.status : WeappVersionStatusEnum.APPLET_AUDIT_FAIL.status); version.status = submitResult.errcode === "0" ? WeappVersionStatusEnum.APPLET_AUDITING.status : WeappVersionStatusEnum.APPLET_AUDIT_FAIL.status;
version.setFailReason(submitResult.getErrmsg()); version.failReason = submitResult.errmsg;
version.updateTime = Date.now( / 1000); version.updateTime = Date.now( / 1000);
version.setAuditid(ObjectUtil.isNotNull(submitResult.getAuditId()) ? submitResult.getAuditId().toString() : ""); version.auditid = ObjectUtil.isNotNull(submitResult.auditId ? submitResult.auditId.toString() : "");
weappVersionMapper.updateById(version); weappVersionMapper.updateById(version);
@@ -252,14 +252,14 @@ export class WeappVersionServiceImplService {
} }
} catch (e) { } catch (e) {
// 如果检测任务结束未结束 // 如果检测任务结束未结束
if (e.getError().getErrorCode() == 61039) { if (e.error.getErrorCode() == 61039) {
if (scheduler == null || scheduler.isShutdown() || scheduler.isTerminated()) { if (scheduler == null || scheduler.isShutdown() || scheduler.isTerminated()) {
scheduler = Executors.newScheduledThreadPool(1); scheduler = Executors.newScheduledThreadPool(1);
} }
scheduler.schedule(() => submitAudit(siteId, versionId), 30, TimeUnit.SECONDS); scheduler.schedule(() => submitAudit(siteId, versionId), 30, TimeUnit.SECONDS);
} else { } else {
version.status = WeappVersionStatusEnum.APPLET_AUDIT_FAIL.status; version.status = WeappVersionStatusEnum.APPLET_AUDIT_FAIL.status;
version.setFailReason(e.getError().getErrorMsg()); version.failReason = e.error.getErrorMsg();
version.updateTime = Date.now( / 1000); version.updateTime = Date.now( / 1000);
weappVersionMapper.updateById(version); weappVersionMapper.updateById(version);
@@ -279,7 +279,7 @@ export class WeappVersionServiceImplService {
*/ */
async siteWeappCommit(): Promise<any> { async siteWeappCommit(): Promise<any> {
const site: SiteInfoVo = this.coreSiteService.getSiteCache(this.requestContext.siteId); const site: SiteInfoVo = this.coreSiteService.getSiteCache(this.requestContext.siteId);
this.weappCommit(site.siteId, site.getGroupId(), null); this.weappCommit(site.siteId, site.groupId, null);
} }
/** /**
@@ -300,7 +300,7 @@ export class WeappVersionServiceImplService {
if (lastVersion != null) { if (lastVersion != null) {
const versionVo: WxOplatfromWeappVersionVo = new WxOplatfromWeappVersionVo(); const versionVo: WxOplatfromWeappVersionVo = new WxOplatfromWeappVersionVo();
Object.assign(versionVo, lastVersion); Object.assign(versionVo, lastVersion);
vo.setCommitRecord(versionVo); vo.commitRecord = versionVo;
} }
list.push(vo); list.push(vo);
} }
@@ -320,7 +320,7 @@ export class WeappVersionServiceImplService {
try { try {
const commitResult: WxOpenResult = WechatUtils.WxOpen().getWxOpenComponentService() const commitResult: WxOpenResult = WechatUtils.WxOpen().getWxOpenComponentService()
.getWxMaServiceByAppid(weappCofig.getAppId()).undoCodeAudit(); .getWxMaServiceByAppid(weappCofig.appId).undoCodeAudit();
} catch (e) { } catch (e) {
throw new BadRequestException(e.message); throw new BadRequestException(e.message);
} }
@@ -341,12 +341,12 @@ export class WeappVersionServiceImplService {
); );
if (!version) throw new BadRequestException("平台尚未上传小程序到模板库"); if (!version) throw new BadRequestException("平台尚未上传小程序到模板库");
const siteIds: number[] = 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.siteGroupId)).stream().map(Site::getSiteId);
if (CommonUtils.isNotEmpty(siteIds)) { if (CommonUtils.isNotEmpty(siteIds)) {
const authSite: SysConfig[] = this.sysConfigRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("config_key", ConfigKeyEnum.path.basename(WEAPP_AUTHORIZATION_INFO))); const authSite: SysConfig[] = this.sysConfigRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("config_key", ConfigKeyEnum.path.basename(WEAPP_AUTHORIZATION_INFO)));
if (CommonUtils.isNotEmpty(authSite)) { if (CommonUtils.isNotEmpty(authSite)) {
authSite.forEach(item => { authSite.forEach(item => {
weappCommit(item.siteId, param.getSiteGroupId(), version); weappCommit(item.siteId, param.siteGroupId, version);
}); });
} }
} }

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

@@ -20,15 +20,15 @@ export class AppServiceImplService {
try { try {
const app: WxMpService = WechatUtils.app(this.requestContext.siteId); const app: WxMpService = WechatUtils.app(this.requestContext.siteId);
const wxOAuth2AccessToken: WxOAuth2AccessToken = app.getOAuth2Service().getAccessToken(param.getCode()); const wxOAuth2AccessToken: WxOAuth2AccessToken = app.oAuth2Service.getAccessToken(param.code);
const wxUser: WxOAuth2UserInfo = app.getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null); const wxUser: WxOAuth2UserInfo = app.oAuth2Service.getUserInfo(wxOAuth2AccessToken, null);
return this.login( return this.login(
ObjectUtil.defaultIfNull(wxUser.getOpenid(), ""), ObjectUtil.defaultIfNull(wxUser.openid, ""),
ObjectUtil.defaultIfNull(wxUser.getUnionId(), ""), ObjectUtil.defaultIfNull(wxUser.unionId, ""),
ObjectUtil.defaultIfNull(wxUser.getNickname(), ""), ObjectUtil.defaultIfNull(wxUser.nickname, ""),
ObjectUtil.defaultIfNull(wxUser.getHeadImgUrl(), ""), ObjectUtil.defaultIfNull(wxUser.headImgUrl, ""),
param.getPid() param.pid
); );
} catch (e) { } catch (e) {
throw new BadRequestException(e.message); throw new BadRequestException(e.message);
@@ -40,8 +40,8 @@ export class AppServiceImplService {
*/ */
async getNewVersion(param: GetNewVersionParam): Promise<any> { async getNewVersion(param: GetNewVersionParam): Promise<any> {
const appVersion: AppVersion = this.appVersionRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })) const appVersion: AppVersion = this.appVersionRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }))
.eq("platform", param.getPlatform()) .eq("platform", param.platform)
.gt("version_code", param.getVersionCode()) .gt("version_code", param.versionCode)
.eq("status", AppDict.StatusEnum.STATUS_PUBLISHED.value) .eq("status", AppDict.StatusEnum.STATUS_PUBLISHED.value)
.orderByDesc("version_code")); .orderByDesc("version_code"));
@@ -59,7 +59,7 @@ export class AppServiceImplService {
* register * register
*/ */
async register(param: AuthRegisterParam): Promise<any> { async register(param: AuthRegisterParam): Promise<any> {
switch (param.getRegisterType()) { switch (param.registerType) {
case "wechat": case "wechat":
return wechatRegister(param); return wechatRegister(param);
default: default:
@@ -76,7 +76,7 @@ export class AppServiceImplService {
BeanUtil.copyProperties(config, vo); BeanUtil.copyProperties(config, vo);
const weappConfig: WeappConfigVo = this.coreWeappConfigService.getWeappConfig(this.requestContext.siteId); const weappConfig: WeappConfigVo = this.coreWeappConfigService.getWeappConfig(this.requestContext.siteId);
vo.setWeappOriginal(weappConfig.getWeappOriginal()); vo.weappOriginal = weappConfig.weappOriginal;
return vo; return vo;
} }
@@ -84,27 +84,27 @@ export class AppServiceImplService {
* wechatRegister * wechatRegister
*/ */
async wechatRegister(param: AuthRegisterParam): Promise<any> { async wechatRegister(param: AuthRegisterParam): Promise<any> {
if (param.getOpenid().isEmpty()) throw new BadRequestException("openid不能为空"); if (param.openid.isEmpty()) throw new BadRequestException("openid不能为空");
try { try {
const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId)); const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
if (ObjectUtil.isNotNull(member)) throw new BadRequestException("账号已存在"); if (ObjectUtil.isNotNull(member)) throw new BadRequestException("账号已存在");
if (!param.getUnionid().isEmpty()) { if (!param.unionid.isEmpty()) {
const unionidMember: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId)); const unionidMember: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
if (ObjectUtil.isNotNull(unionidMember)) throw new BadRequestException("账号已存在"); if (ObjectUtil.isNotNull(unionidMember)) throw new BadRequestException("账号已存在");
} }
const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId); const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId);
if (config.getIsBindMobile() == 1) { if (config.isBindMobile == 1) {
if (param.getMobile().isEmpty()) throw new BadRequestException("手机号不能为空"); if (param.mobile.isEmpty()) throw new BadRequestException("手机号不能为空");
this.registerService.checkMobileCode(param.getMobile(), param.getMobileKey(), param.getMobileCode()); this.registerService.checkMobileCode(param.mobile, param.mobileKey, param.mobileCode);
} }
const registerMember: Member = new Member(); const registerMember: Member = new Member();
registerMember.setWxappOpenid(param.getOpenid()); registerMember.wxappOpenid = param.openid;
registerMember.setMobile(param.getMobile()); registerMember.mobile = param.mobile;
registerMember.setWxUnionid(param.getUnionid()); registerMember.wxUnionid = param.unionid;
registerMember.setPid(param.getPid()); registerMember.pid = param.pid;
return this.registerService.register(registerMember); return this.registerService.register(registerMember);
} catch (e) { } catch (e) {
throw new BadRequestException(e.message); throw new BadRequestException(e.message);

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

@@ -153,7 +153,7 @@ export class DiyFormServiceImplService {
if (CommonUtils.isNotEmpty(diyFormSubmitConfig)) { if (CommonUtils.isNotEmpty(diyFormSubmitConfig)) {
BeanUtil.copyProperties(diyFormSubmitConfig, configInfoVo); BeanUtil.copyProperties(diyFormSubmitConfig, configInfoVo);
} }
vo.setDiyFormSubmitConfig(configInfoVo); vo.diyFormSubmitConfig = configInfoVo;
return vo; return vo;
} }
@@ -175,7 +175,7 @@ export class DiyFormServiceImplService {
Object.assign(diyFormRecordsFieldsListVo, item); Object.assign(diyFormRecordsFieldsListVo, item);
volist.push(diyFormRecordsFieldsListVo); volist.push(diyFormRecordsFieldsListVo);
} }
vo.setRecordsFieldList(volist); vo.recordsFieldList = volist;
} }
return vo; return vo;
} }
@@ -190,7 +190,7 @@ export class DiyFormServiceImplService {
} }
const formId: number = memberConfig.formId; const formId: number = memberConfig.formId;
MPJany /* TODO: QueryWrapper<DiyFormRecords> */ mpjqw = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<DiyFormRecords> */ mpjqw = new MPJQueryWrapper();
mpjqw.setAlias("fr").leftJoin("?_diy_form_records_fields frf on frf.record_id = fr.record_id".replace("?_", this.appConfig.tablePrefix)); mpjqw.alias = "fr".leftJoin("?_diy_form_records_fields frf on frf.record_id = fr.record_id".replace("?_", this.appConfig.tablePrefix));
mpjqw.select("frf.form_id, frf.form_field_id, frf.field_key, frf.field_type, frf.field_name, frf.field_value, frf.field_required, frf.field_unique, frf.privacy_protection"); mpjqw.select("frf.form_id, frf.form_field_id, frf.field_key, frf.field_type, frf.field_name, frf.field_value, frf.field_required, frf.field_unique, frf.privacy_protection");
mpjqw.eq("fr.member_id", this.requestContext.memberId) mpjqw.eq("fr.member_id", this.requestContext.memberId)
.eq("fr.form_id", formId) .eq("fr.form_id", formId)
@@ -198,7 +198,7 @@ export class DiyFormServiceImplService {
const diyFormRecordsFields: DiyFormRecordsFields[] = diyFormRecordsMapper.selectJoinList(DiyFormRecordsFields.class, mpjqw); const diyFormRecordsFields: DiyFormRecordsFields[] = diyFormRecordsMapper.selectJoinList(DiyFormRecordsFields.class, mpjqw);
MPJany /* TODO: QueryWrapper<DiyForm> */ diyFormMpjqw = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<DiyForm> */ diyFormMpjqw = new MPJQueryWrapper();
diyFormMpjqw.setAlias("df") diyFormMpjqw.alias = "df"
.leftJoin("?_diy_form_fields dfi on dfi.form_id = df.form_id".replace("?_", this.appConfig.tablePrefix)); .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.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); diyFormMpjqw.eq("df.form_id", formId).eq("df.status", 1);
@@ -214,9 +214,9 @@ export class DiyFormServiceImplService {
const result: DiyMemberRecordVo = setResult(diyFormFields); const result: DiyMemberRecordVo = setResult(diyFormFields);
const fieldMap: Record<String, DiyFormRecordsFields> = diyFormRecordsFields.collect(/* Collectors已删除 */.toMap(DiyFormRecordsFields::getFieldKey, field => field)); const fieldMap: Record<String, DiyFormRecordsFields> = diyFormRecordsFields.collect(/* Collectors已删除 */.toMap(DiyFormRecordsFields::getFieldKey, field => field));
for (const field of result.getFormField()) { for (const field of result.formField) {
if (fieldMap.containsKey(field.getFieldKey())) { if (fieldMap.containsKey(field.fieldKey)) {
field.setFieldValue(fieldMap.get(field.getFieldKey()).getFieldValue() == null ? "" : fieldMap.get(field.getFieldKey()).getFieldValue()); field.fieldValue = fieldMap.get(field.fieldKey.getFieldValue() == null ? "" : fieldMap.get(field.fieldKey).getFieldValue());
} }
} }
return result; return result;
@@ -226,7 +226,7 @@ export class DiyFormServiceImplService {
* editRecord * editRecord
*/ */
async editRecord(param: DiyFormRecordsParam): Promise<any> { async editRecord(param: DiyFormRecordsParam): Promise<any> {
const diyFormRecords: DiyFormRecords = diyFormRecordsMapper.selectById(param.getRecordId()); const diyFormRecords: DiyFormRecords = diyFormRecordsMapper.selectById(param.recordId);
if (CommonUtils.isEmpty(diyFormRecords)) { if (CommonUtils.isEmpty(diyFormRecords)) {
throw new ApiException("表单记录不存在"); throw new ApiException("表单记录不存在");
} }

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

@@ -70,10 +70,10 @@ export class DiyServiceImplService {
info.title = pageData.getStr("title"); info.title = pageData.getStr("title");
info.name = pageData.getStr("type"); info.name = pageData.getStr("type");
info.type = pageData.getStr("type"); info.type = pageData.getStr("type");
info.setTemplate(pageData.getStr("template")); info.template = pageData.getStr("template");
info.setMode(pageData.getStr("mode")); info.mode = pageData.getStr("mode");
info.value = pageData.getRecord<string, any>("data".toString()); info.value = pageData.getRecord<string, any>("data".toString());
info.setIsDefault(1); info.isDefault = 1;
} }
} }
} }
@@ -115,12 +115,12 @@ export class DiyServiceImplService {
* tabbarList * tabbarList
*/ */
async tabbarList(param: DiyTabbarListParam): Promise<any> { async tabbarList(param: DiyTabbarListParam): Promise<any> {
const list: BottomConfigVo[] = this.coreDiyConfigService.getBottomList(); const list: BottomConfigVo[] = this.coreDiyConfigService.bottomList;
const site: SiteInfoVo = this.coreSiteService.getSiteCache(param.siteId()); const site: SiteInfoVo = this.coreSiteService.getSiteCache(param.siteId());
const tabbarList: BottomConfigVo[] = []; const tabbarList: BottomConfigVo[] = [];
for (const item of list) { for (const item of list) {
if (item.key === "app" && list.length > 1 && site.getApps().size() == 1) continue; if (item.key === "app" && list.length > 1 && site.apps.size() == 1) continue;
const config: BottomConfigVo = this.coreDiyConfigService.getBottomConfig(param.siteId(), item.key); const config: BottomConfigVo = this.coreDiyConfigService.getBottomConfig(param.siteId(), item.key);
tabbarList.push(config); tabbarList.push(config);
} }
@@ -134,20 +134,20 @@ export class DiyServiceImplService {
async share(param: DiyShareParam): Promise<any> { async share(param: DiyShareParam): Promise<any> {
any /* TODO: QueryWrapper<DiyRoute> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<DiyRoute> */ queryWrapper = new QueryWrapper();
queryWrapper.select("id,title,name,page,share,is_share"); queryWrapper.select("id,title,name,page,share,is_share");
queryWrapper.eq("page", param.getRoute()); queryWrapper.eq("page", param.route);
queryWrapper.eq("site_id", param.siteId()); queryWrapper.eq("site_id", param.siteId());
const diyRoute: DiyRoute = this.diyRouteRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }); const diyRoute: DiyRoute = this.diyRouteRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
if (diyRoute == null || diyRoute.getShare().isEmpty()) return new Record<string, any>(); if (diyRoute == null || diyRoute.share.isEmpty()) return new Record<string, any>();
const share: Record<string, any> = JsonUtils.parseObject<any>(diyRoute.getShare()); const share: Record<string, any> = JsonUtils.parseObject<any>(diyRoute.share);
share.set("route", diyRoute.page); share.set("route", diyRoute.page);
share.set("query", ""); share.set("query", "");
const query: Record<string, any> = new Record<string, any>(); const query: Record<string, any> = new Record<string, any>();
if (param.getParams() != null && !param.getParams().isEmpty()) { if (param.params != null && !param.params.isEmpty()) {
query = JsonUtils.parseObject<any>(param.getParams()); query = JsonUtils.parseObject<any>(param.params);
} }
if (param.memberId() != null && param.memberId() > 0) { if (param.memberId() != null && param.memberId() > 0) {

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

@@ -17,7 +17,7 @@ export class AuthServiceImplService {
const siteId: number = RequestUtils.apiSiteId(); const siteId: number = RequestUtils.apiSiteId();
if (siteId == 0) { if (siteId == 0) {
const site: Site = this.siteRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_domain", RequestUtils.getRequestDomain())); const site: Site = this.siteRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_domain", RequestUtils.requestDomain));
if (site == null) throw new UnauthorizedException("站点不存在", 403); if (site == null) throw new UnauthorizedException("站点不存在", 403);
siteId = site.siteId; siteId = site.siteId;
} }
@@ -26,9 +26,9 @@ export class AuthServiceImplService {
if(CommonUtils.isEmpty(siteInfoVo)){ if(CommonUtils.isEmpty(siteInfoVo)){
throw new UnauthorizedException("站点不存在", 403); throw new UnauthorizedException("站点不存在", 403);
} }
const rule: string = RequestUtils.getReqeustURI(); const rule: string = RequestUtils.reqeustURI;
if (rule !== "site"){ if (rule !== "site"){
if(siteInfoVo.status == SiteStatusEnum.CLOSE.getCode() || siteInfoVo.getExpireTime() < DateUtils.currTime()){ if(siteInfoVo.status == SiteStatusEnum.CLOSE.code || siteInfoVo.expireTime < DateUtils.currTime()){
throw new UnauthorizedException("站点已停止", 402); throw new UnauthorizedException("站点已停止", 402);
} }
} }
@@ -59,15 +59,15 @@ export class AuthServiceImplService {
const channel: string = RequestUtils.channel(); const channel: string = RequestUtils.channel();
const siteId: number = this.requestContext.siteId; const siteId: number = this.requestContext.siteId;
if (channel != null){ if (channel != null){
if (channel === ChannelEnum.H5.getCode()){ if (channel === ChannelEnum.H5.code){
const h5ConfigVo: H5ConfigVo = this.coreH5Service.getH5(siteId); const h5ConfigVo: H5ConfigVo = this.coreH5Service.getH5(siteId);
const isOpen: number = h5ConfigVo.getIsOpen(); const isOpen: number = h5ConfigVo.isOpen;
if(isOpen==0){ if(isOpen==0){
throw new UnauthorizedException("站点已停止", 402); throw new UnauthorizedException("站点已停止", 402);
} }
}else if (channel === ChannelEnum.PC.getCode()){ }else if (channel === ChannelEnum.PC.code){
const pcConfigVo: PcConfigVo = this.corePcService.getPc(siteId); const pcConfigVo: PcConfigVo = this.corePcService.getPc(siteId);
const isOpen: number = pcConfigVo.getIsOpen(); const isOpen: number = pcConfigVo.isOpen;
if(isOpen==0){ if(isOpen==0){
throw new UnauthorizedException("站点已停止", 402); throw new UnauthorizedException("站点已停止", 402);
} }

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

@@ -27,11 +27,11 @@ export class LoginServiceImplService {
* account * account
*/ */
async account(param: AccountLoginParam): Promise<number> { async account(param: AccountLoginParam): Promise<number> {
const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).and(i => i.eq("username", param.getUsername()).or().eq("mobile", param.getUsername()))); const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).and(i => i.eq("username", param.username).or().eq("mobile", param.username)));
if (ObjectUtil.isNull(member)) throw new BadRequestException("账号不存在"); if (ObjectUtil.isNull(member)) throw new BadRequestException("账号不存在");
if (!PasswordEncipher.matche(param.getPassword(), member.getPassword())) throw new BadRequestException("账号或密码错误"); if (!PasswordEncipher.matche(param.password, member.password)) throw new BadRequestException("账号或密码错误");
member.setLoginType(MemberLoginTypeEnum.USERNAME.type); member.loginType = MemberLoginTypeEnum.USERNAME.type;
return this.login(member); return this.login(member);
} }
@@ -43,12 +43,12 @@ export class LoginServiceImplService {
const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId)); const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
if (member != null) { if (member != null) {
member.setLoginType(MemberLoginTypeEnum.MOBILE.type); member.loginType = MemberLoginTypeEnum.MOBILE.type;
return this.login(member); return this.login(member);
} else { } else {
const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId); const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId);
// 开启强制绑定手机号 登录会自动注册 // 开启强制绑定手机号 登录会自动注册
if (config.getIsBindMobile() == 1) { if (config.isBindMobile == 1) {
const registerParam: MobileRegisterParam = new MobileRegisterParam(); const registerParam: MobileRegisterParam = new MobileRegisterParam();
Object.assign(registerParam, param); Object.assign(registerParam, param);
return this.registerService.mobile(registerParam); return this.registerService.mobile(registerParam);
@@ -64,35 +64,35 @@ export class LoginServiceImplService {
member = memberMapper.selectById(member.memberId); member = memberMapper.selectById(member.memberId);
if (StatusEnum.OFF === member.status) throw new BadRequestException("账号被锁定"); if (StatusEnum.OFF === member.status) throw new BadRequestException("账号被锁定");
member.setLoginTime(Date.now() / 1000); member.loginTime = Date.now( / 1000);
member.setLoginIp(RequestUtils.ip()); member.loginIp = RequestUtils.ip();
member.setLoginCount(member.getLoginCount() + 1); member.loginCount = member.loginCount + 1;
member.setLoginChannel(RequestUtils.channel()); member.loginChannel = RequestUtils.channel();
if (member.getLoginType() != null) member.setLoginType(member.getLoginType()); if (member.loginType != null) member.loginType = member.loginType;
member.setLastVisitTime(Date.now() / 1000); member.lastVisitTime = Date.now( / 1000);
this.memberMapper.updateById(member); this.memberMapper.updateById(member);
const loginModel: SaLoginModel = SaLoginModel.create(); const loginModel: SaLoginModel = SaLoginModel.create();
loginModel.setDevice(RequestUtils.handler().getHeader("User-Agent")); loginModel.device = RequestUtils.handler(.getHeader("User-Agent"));
loginModel.setExtra("memberId", member.memberId); loginModel.extra = "memberId", member.memberId;
loginModel.setExtra("username", member.getUsername()); loginModel.extra = "username", member.username;
loginModel.setExtra("siteId", member.siteId); loginModel.extra = "siteId", member.siteId;
// 执行登录 // 执行登录
StpUtil.login("member-" + member.memberId, loginModel); StpUtil.login("member-" + member.memberId, loginModel);
// 获取返回内容 // 获取返回内容
const saTokenInfo: SaTokenInfo = StpUtil.getTokenInfo(); const saTokenInfo: SaTokenInfo = StpUtil.tokenInfo;
const vo: LoginVo = new LoginVo(); const vo: LoginVo = new LoginVo();
vo.setToken(saTokenInfo.getTokenValue()); vo.token = saTokenInfo.tokenValue;
vo.setExpiresTime(DateUtils.currTime()+saTokenInfo.getTokenTimeout()); vo.expiresTime = DateUtils.currTime(+saTokenInfo.tokenTimeout);
vo.setMobile(member.getMobile()); vo.mobile = member.mobile;
// 会员登录事件 // 会员登录事件
const loginEvent: MemberLoginEvent = new MemberLoginEvent(); const loginEvent: MemberLoginEvent = new MemberLoginEvent();
loginEvent.siteId = this.requestContext.siteId; loginEvent.siteId = this.requestContext.siteId;
loginEvent.addAppSign("core"); loginEvent.addAppSign("core");
loginEvent.name = "MemberLoginEvent"; loginEvent.name = "MemberLoginEvent";
loginEvent.setMember(member); loginEvent.member = member;
EventPublisher.publishEvent(loginEvent); EventPublisher.publishEvent(loginEvent);
return vo; return vo;
@@ -102,10 +102,10 @@ export class LoginServiceImplService {
* resetPassword * resetPassword
*/ */
async resetPassword(param: ResetPasswordParam): Promise<any> { async resetPassword(param: ResetPasswordParam): Promise<any> {
const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", param.getMobile()).eq("site_id", this.requestContext.siteId)); const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", param.mobile).eq("site_id", this.requestContext.siteId));
if (ObjectUtil.isNull(member)) throw new BadRequestException("当前填写的手机号不存在账号"); if (ObjectUtil.isNull(member)) throw new BadRequestException("当前填写的手机号不存在账号");
member.setPassword(PasswordEncipher.encode(param.getPassword())); member.password = PasswordEncipher.encode(param.password);
this.memberMapper.updateById(member); this.memberMapper.updateById(member);
} }
@@ -123,13 +123,13 @@ export class LoginServiceImplService {
const key: string = RandomUtil.randomString(30); const key: string = RandomUtil.randomString(30);
const cache: MobileCodeCacheVo = new MobileCodeCacheVo(); const cache: MobileCodeCacheVo = new MobileCodeCacheVo();
cache.setMobile(param.getMobile()); cache.mobile = param.mobile;
cache.setCode(String.format("%0" + 4 + "d", RandomUtil.randomInt(1, 9999))); cache.code = String.format("%0" + 4 + "d", RandomUtil.randomInt(1, 9999));
cache.type = param.type; cache.type = param.type;
const data: Record<String, Object> = {}; const data: Record<String, Object> = {};
data.put("mobile", param.getMobile()); data.put("mobile", param.mobile);
data.put("code", cache.getCode()); data.put("code", cache.code);
this.coreNoticeService.send(param.siteId(), "member_verify_code", data); this.coreNoticeService.send(param.siteId(), "member_verify_code", data);

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

@@ -18,31 +18,31 @@ export class RegisterServiceImplService {
*/ */
async checkLoginConfig(type: string): Promise<any> { async checkLoginConfig(type: string): Promise<any> {
const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId); const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId);
if (MemberLoginTypeEnum.USERNAME.type === type && config.getIsUsername() != 1) throw new BadRequestException("未开启账号登录注册"); if (MemberLoginTypeEnum.USERNAME.type === type && config.isUsername != 1) throw new BadRequestException("未开启账号登录注册");
if (MemberLoginTypeEnum.MOBILE.type === type && config.getIsMobile() != 1) throw new BadRequestException("未开启手机验证码登录注册"); if (MemberLoginTypeEnum.MOBILE.type === type && config.isMobile != 1) throw new BadRequestException("未开启手机验证码登录注册");
} }
/** /**
* account * account
*/ */
async account(param: AccountRegisterParam): Promise<number> { async account(param: AccountRegisterParam): Promise<number> {
const memberExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("username", param.getUsername()).eq("site_id", this.requestContext.siteId)); const memberExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("username", param.username).eq("site_id", this.requestContext.siteId));
if (ObjectUtil.isNotNull(memberExist)) throw new BadRequestException("账号已存在"); if (ObjectUtil.isNotNull(memberExist)) throw new BadRequestException("账号已存在");
if (!param.getMobile().isEmpty()) { if (!param.mobile.isEmpty()) {
const mobileExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", param.getMobile()).eq("site_id", this.requestContext.siteId)); const mobileExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", param.mobile).eq("site_id", this.requestContext.siteId));
if (ObjectUtil.isNotNull(mobileExist)) throw new BadRequestException("当前手机号已绑定账号"); if (ObjectUtil.isNotNull(mobileExist)) throw new BadRequestException("当前手机号已绑定账号");
this.checkMobileCode(param.getMobile(), param.getMobileKey(), param.getMobileCode()); this.checkMobileCode(param.mobile, param.mobileKey, param.mobileCode);
} }
const member: Member = new Member(); const member: Member = new Member();
member.setUsername(param.getUsername()); member.username = param.username;
member.setNickname(param.getUsername()); member.nickname = param.username;
member.setPassword(PasswordEncipher.encode(param.getPassword())); member.password = PasswordEncipher.encode(param.password);
member.setMobile(param.getMobile()); member.mobile = param.mobile;
member.setRegisterType(MemberRegisterTypeEnum.USERNAME.type); member.registerType = MemberRegisterTypeEnum.USERNAME.type;
member.setLoginType(MemberLoginTypeEnum.USERNAME.type); member.loginType = MemberLoginTypeEnum.USERNAME.type;
member.setPid(param.getPid()); member.pid = param.pid;
return this.register(member); return this.register(member);
} }
@@ -51,18 +51,18 @@ export class RegisterServiceImplService {
* mobile * mobile
*/ */
async mobile(param: MobileRegisterParam): Promise<any> { async mobile(param: MobileRegisterParam): Promise<any> {
const memberExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", param.getMobile()).eq("site_id", this.requestContext.siteId)); const memberExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", param.mobile).eq("site_id", this.requestContext.siteId));
if (ObjectUtil.isNotNull(memberExist)) throw new BadRequestException("账号已存在"); if (ObjectUtil.isNotNull(memberExist)) throw new BadRequestException("账号已存在");
const member: Member = new Member(); const member: Member = new Member();
member.setMobile(param.getMobile()); member.mobile = param.mobile;
member.setNickname(param.getMobile().substring(0, 3) + "****" + param.getMobile().substring(7)); member.nickname = param.mobile.substring(0, 3 + "****" + param.mobile.substring(7));
member.setRegisterType(MemberRegisterTypeEnum.MOBILE.type); member.registerType = MemberRegisterTypeEnum.MOBILE.type;
member.setLoginType(MemberLoginTypeEnum.MOBILE.type); member.loginType = MemberLoginTypeEnum.MOBILE.type;
member.setPid(param.getPid()); member.pid = param.pid;
member.setHeadimg(ObjectUtil.defaultIfNull(param.getAvatar(), "")); member.headimg = ObjectUtil.defaultIfNull(param.avatar, "");
member.setNickname(ObjectUtil.defaultIfNull(param.getNickname(), "")); member.nickname = ObjectUtil.defaultIfNull(param.nickname, "");
member.setWxOpenid(ObjectUtil.defaultIfNull(param.getOpenid(), "")); member.wxOpenid = ObjectUtil.defaultIfNull(param.openid, "");
return this.register(member); return this.register(member);
} }
@@ -72,30 +72,30 @@ export class RegisterServiceImplService {
*/ */
async register(member: Member): Promise<any> { async register(member: Member): Promise<any> {
const request: HttpServletRequest = RequestUtils.handler(); const request: HttpServletRequest = RequestUtils.handler();
const pid: number = ObjectUtil.defaultIfNull(member.getPid(), 0); const pid: number = ObjectUtil.defaultIfNull(member.pid, 0);
if (pid > 0) { if (pid > 0) {
const inviteMember: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("member_id", member.getPid()).eq("site_id", this.requestContext.siteId)); const inviteMember: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("member_id", member.pid).eq("site_id", this.requestContext.siteId));
if (inviteMember == null) member.setPid(0); if (inviteMember == null) member.pid = 0;
} }
if (member.getMobile() != null && !member.getMobile().isEmpty()) { if (member.mobile != null && !member.mobile.isEmpty()) {
const mobile: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", member.getMobile()).eq("site_id", this.requestContext.siteId)); const mobile: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", member.mobile).eq("site_id", this.requestContext.siteId));
if (ObjectUtil.isNotNull(mobile)) throw new BadRequestException("账号已存在"); if (ObjectUtil.isNotNull(mobile)) throw new BadRequestException("账号已存在");
} }
if (CommonUtils.isEmpty(member.getNickname())) { if (CommonUtils.isEmpty(member.nickname)) {
if (CommonUtils.isNotEmpty(member.getUsername())) { if (CommonUtils.isNotEmpty(member.username)) {
member.setNickname(member.getUsername()); member.nickname = member.username;
} else if (CommonUtils.isNotEmpty(member.getMobile())) { } else if (CommonUtils.isNotEmpty(member.mobile)) {
member.setNickname(member.getMobile().substring(0, 3) + "****" + member.getMobile().substring(7)); member.nickname = member.mobile.substring(0, 3 + "****" + member.mobile.substring(7));
} else { } else {
member.setNickname(createName()); member.nickname = createName();
} }
} }
member.siteId = this.requestContext.siteId; member.siteId = this.requestContext.siteId;
member.createTime = Date.now( / 1000); member.createTime = Date.now( / 1000);
member.setMemberNo(this.coreMemberService.createMemberNo(this.requestContext.siteId)); member.memberNo = this.coreMemberService.createMemberNo(this.requestContext.siteId);
member.setRegisterChannel(RequestUtils.channel()); member.registerChannel = RequestUtils.channel();
this.this.memberRepository.save(member); this.this.memberRepository.save(member);
// 会员注册事件 // 会员注册事件
@@ -103,7 +103,7 @@ export class RegisterServiceImplService {
registerEvent.siteId = this.requestContext.siteId; registerEvent.siteId = this.requestContext.siteId;
registerEvent.addAppSign("core"); registerEvent.addAppSign("core");
registerEvent.name = "MemberRegisterEvent"; registerEvent.name = "MemberRegisterEvent";
registerEvent.setMember(member); registerEvent.member = member;
EventPublisher.publishEvent(registerEvent); EventPublisher.publishEvent(registerEvent);
return this.loginService.login(member); return this.loginService.login(member);
@@ -120,7 +120,7 @@ export class RegisterServiceImplService {
if (ObjectUtil.isNull(cache)) throw new BadRequestException("手机验证码有误"); if (ObjectUtil.isNull(cache)) throw new BadRequestException("手机验证码有误");
const vo: MobileCodeCacheVo = new MobileCodeCacheVo(); const vo: MobileCodeCacheVo = new MobileCodeCacheVo();
Object.assign(vo, cache); Object.assign(vo, cache);
if (!vo.getMobile() === mobile || !vo.getCode() === mobileCode) throw new BadRequestException("手机验证码有误"); if (!vo.mobile === mobile || !vo.code === mobileCode) throw new BadRequestException("手机验证码有误");
cached.remove(mobileKey); cached.remove(mobileKey);
} }
} }

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

@@ -21,11 +21,11 @@ export class MemberAccountServiceImplService {
any /* TODO: QueryWrapper<MemberAccountLog> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<MemberAccountLog> */ queryWrapper = new QueryWrapper();
queryWrapper.select("id"); queryWrapper.select("id");
queryWrapper.eq("member_id", param.memberId()); queryWrapper.eq("member_id", param.memberId());
if (StrUtil.isNotEmpty(param.getAccountType())) { if (StrUtil.isNotEmpty(param.accountType)) {
queryWrapper.eq("account_type", param.getAccountType()); queryWrapper.eq("account_type", param.accountType);
} }
if (StrUtil.isNotEmpty(param.getFromType())) { if (StrUtil.isNotEmpty(param.fromType)) {
queryWrapper.eq("from_type", param.getFromType()); queryWrapper.eq("from_type", param.fromType);
} }
if (CommonUtils.isNotEmpty(param.createTime)) { if (CommonUtils.isNotEmpty(param.createTime)) {
QueryMapperUtils.buildByTime(queryWrapper, "create_time", param.createTime); QueryMapperUtils.buildByTime(queryWrapper, "create_time", param.createTime);
@@ -39,7 +39,7 @@ export class MemberAccountServiceImplService {
*/ */
async getAccountSource(param: AccountAccountSourceParam): Promise<number> { async getAccountSource(param: AccountAccountSourceParam): Promise<number> {
const jsonObject: Record<string, any> = JsonModuleLoader.build().mergeResultElement("account_change_type.json"); const jsonObject: Record<string, any> = JsonModuleLoader.build().mergeResultElement("account_change_type.json");
const accountTypeObject: Record<string, any> = jsonObject.getRecord<string, any>(param.getAccountType()); const accountTypeObject: Record<string, any> = jsonObject.getRecord<string, any>(param.accountType);
if (accountTypeObject == null) { if (accountTypeObject == null) {
throw new BaseException("MEMBER_TYPE_NOT_EXIST"); throw new BaseException("MEMBER_TYPE_NOT_EXIST");
} }
@@ -59,11 +59,11 @@ export class MemberAccountServiceImplService {
if (member == null) { if (member == null) {
throw new BaseException("会员不存在"); throw new BaseException("会员不存在");
} }
if (member.getPoint() != null) { if (member.point != null) {
accountPointCountVo.setPoint(member.getPoint()); accountPointCountVo.point = member.point;
} }
if (member.getPointGet() != null) { if (member.pointGet != null) {
accountPointCountVo.setPointGet(member.getPointGet()); accountPointCountVo.pointGet = member.pointGet;
} }
const accountLog: MemberAccountLog = this.memberAccountLogRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })) const accountLog: MemberAccountLog = this.memberAccountLogRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }))
@@ -74,7 +74,7 @@ export class MemberAccountServiceImplService {
.groupBy("member_id") .groupBy("member_id")
); );
if (accountLog != null) { if (accountLog != null) {
accountPointCountVo.setUse(Math.abs(accountLog.getAccountData().doubleValue())); accountPointCountVo.use = Math.abs(accountLog.accountData.doubleValue());
} }
return accountPointCountVo; return accountPointCountVo;
} }

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

@@ -22,7 +22,7 @@ export class MemberAddressServiceImplService {
// 校验区域有效性 // 校验区域有效性
// this.checkAndFillAddressValue(param); // this.checkAndFillAddressValue(param);
// 默认地址设定 // 默认地址设定
if (param.getIsDefault() != null && param.getIsDefault() == 1) { if (param.isDefault != null && param.isDefault == 1) {
try { try {
this.deleteDefaultAddress(param.memberId()); this.deleteDefaultAddress(param.memberId());
} catch (e) { } catch (e) {
@@ -66,7 +66,7 @@ export class MemberAddressServiceImplService {
// 校验区域有效性 // 校验区域有效性
// this.checkAndFillAddressValue(param); // this.checkAndFillAddressValue(param);
// 默认地址设定 // 默认地址设定
if (param.getIsDefault() != null && param.getIsDefault() == 1) { if (param.isDefault != null && param.isDefault == 1) {
try { try {
deleteDefaultAddress(param.memberId()); deleteDefaultAddress(param.memberId());
} catch (e) { } catch (e) {

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

@@ -42,12 +42,12 @@ export class MemberCashOutServiceImplService {
if (vo != null) { if (vo != null) {
MemberCashOutInfoVo.const transfer: Transfer = new MemberCashOutInfoVo.Transfer(); MemberCashOutInfoVo.const transfer: Transfer = new MemberCashOutInfoVo.Transfer();
transfer.setTransferNo(vo.getTransferNo()); transfer.transferNo = vo.transferNo;
transfer.setTransferRemark(vo.getTransferRemark()); transfer.transferRemark = vo.transferRemark;
transfer.setTransferVoucher(vo.getTransferVoucher()); transfer.transferVoucher = vo.transferVoucher;
transfer.setExtra(vo.getExtra()); transfer.extra = vo.extra;
transfer.setPackageInfo(vo.getPackageInfo()); transfer.packageInfo = vo.packageInfo;
vo.setTransfer(transfer); vo.transfer = transfer;
} }
return vo; return vo;
@@ -64,7 +64,7 @@ export class MemberCashOutServiceImplService {
* transferMethod * transferMethod
*/ */
async transferMethod(param: MemberCashOutTransferMethodParam): Promise<any> { async transferMethod(param: MemberCashOutTransferMethodParam): Promise<any> {
return TransferTypeEnum.getMap(); return TransferTypeEnum.map;
} }
/** /**
@@ -112,7 +112,7 @@ export class MemberCashOutServiceImplService {
queryWrapper.select("account_id,site_id,member_id,account_type,bank_name,realname,account_no,transfer_payment_code"); queryWrapper.select("account_id,site_id,member_id,account_type,bank_name,realname,account_no,transfer_payment_code");
queryWrapper.eq("site_id", param.siteId()); queryWrapper.eq("site_id", param.siteId());
queryWrapper.eq("member_id", param.memberId()); queryWrapper.eq("member_id", param.memberId());
if (CommonUtils.isNotEmpty(param.getAccountType())) queryWrapper.eq("account_type", param.getAccountType()); if (CommonUtils.isNotEmpty(param.accountType)) queryWrapper.eq("account_type", param.accountType);
queryWrapper.orderByDesc(["create_time"]); queryWrapper.orderByDesc(["create_time"]);
[MemberCashOutAccount[], number] iPage = this.this.memberCashOutAccountRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper); [MemberCashOutAccount[], number] iPage = this.this.memberCashOutAccountRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
const dataList: MemberCashOutAccountVo[] = CollectUtils.convert(iPageRecords, MemberCashOutAccountVo.class); const dataList: MemberCashOutAccountVo[] = CollectUtils.convert(iPageRecords, MemberCashOutAccountVo.class);
@@ -125,7 +125,7 @@ export class MemberCashOutServiceImplService {
async accountDetails(param: MemberCashOutAccountDetailsParam): Promise<number> { async accountDetails(param: MemberCashOutAccountDetailsParam): Promise<number> {
any /* TODO: QueryWrapper<MemberCashOutAccount> */ queryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<MemberCashOutAccount> */ queryWrapper = new QueryWrapper();
queryWrapper.select("account_id,site_id,member_id,account_type,bank_name,realname,account_no,transfer_payment_code"); queryWrapper.select("account_id,site_id,member_id,account_type,bank_name,realname,account_no,transfer_payment_code");
queryWrapper.eq("account_id", param.getAccountId()); queryWrapper.eq("account_id", param.accountId);
queryWrapper.eq("site_id", param.siteId()); queryWrapper.eq("site_id", param.siteId());
queryWrapper.eq("member_id", param.memberId()); queryWrapper.eq("member_id", param.memberId());
const memberCashOutAccount: MemberCashOutAccount = this.this.memberCashOutAccountRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }); const memberCashOutAccount: MemberCashOutAccount = this.this.memberCashOutAccountRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
@@ -142,7 +142,7 @@ export class MemberCashOutServiceImplService {
queryWrapper.select("account_id,site_id,member_id,account_type,bank_name,realname,account_no,transfer_payment_code"); queryWrapper.select("account_id,site_id,member_id,account_type,bank_name,realname,account_no,transfer_payment_code");
queryWrapper.eq("site_id", param.siteId()); queryWrapper.eq("site_id", param.siteId());
queryWrapper.eq("member_id", param.memberId()); queryWrapper.eq("member_id", param.memberId());
if (CommonUtils.isNotEmpty(param.getAccountType())) queryWrapper.eq("account_type", param.getAccountType()); if (CommonUtils.isNotEmpty(param.accountType)) queryWrapper.eq("account_type", param.accountType);
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time");
queryWrapper.last("limit 1"); queryWrapper.last("limit 1");
const memberCashOutAccount: MemberCashOutAccount = this.this.memberCashOutAccountRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }); const memberCashOutAccount: MemberCashOutAccount = this.this.memberCashOutAccountRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
@@ -164,7 +164,7 @@ export class MemberCashOutServiceImplService {
Object.assign(newMemberCashOutAccount, param); Object.assign(newMemberCashOutAccount, param);
this.this.memberCashOutAccountRepository.save(newMemberCashOutAccount); this.this.memberCashOutAccountRepository.save(newMemberCashOutAccount);
// 返回当前对象的ID // 返回当前对象的ID
return newMemberCashOutAccount.getAccountId(); return newMemberCashOutAccount.accountId;
} }
/** /**
@@ -179,7 +179,7 @@ export class MemberCashOutServiceImplService {
} }
const newMemberCashOutAccount: MemberCashOutAccount = new MemberCashOutAccount(); const newMemberCashOutAccount: MemberCashOutAccount = new MemberCashOutAccount();
Object.assign(newMemberCashOutAccount, param); Object.assign(newMemberCashOutAccount, param);
newMemberCashOutAccount.setAccountId(accountId); newMemberCashOutAccount.accountId = accountId;
newMemberCashOutAccount.updateTime = Date.now( / 1000); newMemberCashOutAccount.updateTime = Date.now( / 1000);
return this.memberCashOutAccountMapper.updateById(newMemberCashOutAccount); return this.memberCashOutAccountMapper.updateById(newMemberCashOutAccount);
} }

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

@@ -42,7 +42,7 @@ export class MemberLevelServiceImplService {
if (memberLevelList == null) return null; if (memberLevelList == null) return null;
const levelStyle: Record<string, any> = MemberLevelStyleEnum.getStyle(); const levelStyle: Record<string, any> = MemberLevelStyleEnum.style;
const filling: Record<string, any> = new Record<string, any>(); const filling: Record<string, any> = new Record<string, any>();
filling.put("benefits_one", new Record<string, any>().set("title", "专属客服").set("desc", "专业服务").set("icon", "/static/resource/images/member/benefits/benefits_kefu.png")); filling.put("benefits_one", new Record<string, any>().set("title", "专属客服").set("desc", "专业服务").set("icon", "/static/resource/images/member/benefits/benefits_kefu.png"));
@@ -56,32 +56,32 @@ export class MemberLevelServiceImplService {
const vo: MemberLevelInfoVo = new MemberLevelInfoVo(); const vo: MemberLevelInfoVo = new MemberLevelInfoVo();
Object.assign(vo, level); Object.assign(vo, level);
if (CommonUtils.isNotEmpty(level.getLevelBenefits())) { if (CommonUtils.isNotEmpty(level.levelBenefits)) {
const benefits: Record<string, any> = JsonUtils.parseObject<any>(level.getLevelBenefits()); const benefits: Record<string, any> = JsonUtils.parseObject<any>(level.levelBenefits);
benefits = this.coreMemberService.getBenefitsContent(param.siteId(), benefits, "member_level"); benefits = this.coreMemberService.getBenefitsContent(param.siteId(), benefits, "member_level");
vo.setLevelBenefits(benefits); vo.levelBenefits = benefits;
} else { } else {
vo.setLevelBenefits(filling); vo.levelBenefits = filling;
} }
if (vo.getLevelBenefits().size() < 4) { if (vo.levelBenefits.size() < 4) {
for (const key of filling.keySet()) { for (const key of filling.keySet()) {
if (vo.getLevelBenefits().size() == 4) break; if (vo.levelBenefits.size() == 4) break;
vo.getLevelBenefits().putByPath(key + ".content", filling.get(key)); vo.levelBenefits.putByPath(key + ".content", filling.get(key));
} }
} }
if (!level.getLevelGifts().isEmpty()) { if (!level.levelGifts.isEmpty()) {
const gifts: Record<string, any> = JsonUtils.parseObject<any>(level.getLevelGifts()); const gifts: Record<string, any> = JsonUtils.parseObject<any>(level.levelGifts);
gifts = this.coreMemberService.getGiftContent(param.siteId(), gifts, "member_level"); gifts = this.coreMemberService.getGiftContent(param.siteId(), gifts, "member_level");
vo.setLevelGifts(gifts); vo.levelGifts = gifts;
} }
const levelKey: number = index % 7 + 1; const levelKey: number = index % 7 + 1;
vo.setLevelBg("/static/resource/images/member/level/bg_" + levelKey + ".png"); vo.levelBg = "/static/resource/images/member/level/bg_" + levelKey + ".png";
vo.setMemberBg("/static/resource/images/member/level/member_" + levelKey + ".png"); vo.memberBg = "/static/resource/images/member/level/member_" + levelKey + ".png";
vo.setLevelIcon("/static/resource/images/member/level/level_icon" + levelKey + ".png"); vo.levelIcon = "/static/resource/images/member/level/level_icon" + levelKey + ".png";
vo.setLevelTag("/static/resource/images/member/level/level_" + levelKey + ".png"); vo.levelTag = "/static/resource/images/member/level/level_" + levelKey + ".png";
vo.setLevelStyle(levelStyle.getRecord<string, any>("level_" + levelKey)); vo.levelStyle = levelStyle.getRecord<string, any>("level_" + levelKey);
list.push(vo); list.push(vo);
index++; index++;
@@ -95,7 +95,7 @@ export class MemberLevelServiceImplService {
*/ */
async findMemberLevel(memberId: number): Promise<any> { async findMemberLevel(memberId: number): Promise<any> {
MPJany /* TODO: QueryWrapper<Member> */ queryWrapper = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<Member> */ queryWrapper = new MPJQueryWrapper();
queryWrapper.setAlias("m") queryWrapper.alias = "m"
.leftJoin("?_member_level ml ON ml.level_id = m.member_level".replace("?_", this.appConfig.tablePrefix)); .leftJoin("?_member_level ml ON ml.level_id = m.member_level".replace("?_", this.appConfig.tablePrefix));
queryWrapper.select("ml.*"); queryWrapper.select("ml.*");
queryWrapper.eq("m.member_id", memberId); queryWrapper.eq("m.member_id", memberId);
@@ -106,8 +106,8 @@ export class MemberLevelServiceImplService {
const vo: MemberLevelInfoVo = new MemberLevelInfoVo(); const vo: MemberLevelInfoVo = new MemberLevelInfoVo();
Object.assign(vo, level); Object.assign(vo, level);
if (CommonUtils.isNotEmpty(level.getLevelBenefits()) && JSONUtil.isJson(level.getLevelBenefits())) vo.setLevelBenefits(JsonUtils.parseObject<any>(level.getLevelBenefits())); if (CommonUtils.isNotEmpty(level.levelBenefits) && JSONUtil.isJson(level.levelBenefits)) vo.levelBenefits = JsonUtils.parseObject<any>(level.levelBenefits);
if (CommonUtils.isNotEmpty(level.getLevelGifts()) && JSONUtil.isJson(level.getLevelGifts())) vo.setLevelGifts(JsonUtils.parseObject<any>(level.getLevelGifts())); if (CommonUtils.isNotEmpty(level.levelGifts) && JSONUtil.isJson(level.levelGifts)) vo.levelGifts = JsonUtils.parseObject<any>(level.levelGifts);
return vo; return vo;
} }
@@ -118,13 +118,13 @@ export class MemberLevelServiceImplService {
async getMobile(mobileCode: string): Promise<any> { async getMobile(mobileCode: string): Promise<any> {
try { try {
const phoneInfo: WxMaPhoneNumberInfo = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getPhoneNoInfo(mobileCode); const phoneInfo: WxMaPhoneNumberInfo = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getPhoneNoInfo(mobileCode);
const mobile: string = phoneInfo.getPurePhoneNumber(); const mobile: string = phoneInfo.purePhoneNumber;
const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", mobile).eq("site_id", this.requestContext.siteId)); const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", mobile).eq("site_id", this.requestContext.siteId));
if (member != null) throw new BadRequestException("当前手机号已绑定账号"); if (member != null) throw new BadRequestException("当前手机号已绑定账号");
const vo: MemberGetMobileVo = new MemberGetMobileVo(); const vo: MemberGetMobileVo = new MemberGetMobileVo();
vo.setMobile(mobile); vo.mobile = mobile;
return vo; return vo;
} catch (e) { } catch (e) {
throw new BadRequestException(e.message); throw new BadRequestException(e.message);

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

@@ -23,7 +23,7 @@ export class MemberServiceImplService {
*/ */
async info(param: MemberInfoParam): Promise<any> { async info(param: MemberInfoParam): Promise<any> {
MPJany /* TODO: QueryWrapper<Member> */ queryWrapper = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<Member> */ queryWrapper = new MPJQueryWrapper();
queryWrapper.setAlias("m") queryWrapper.alias = "m"
.leftJoin("?_member_level ml ON ml.level_id = m.member_level".replace("?_", this.appConfig.tablePrefix)); .leftJoin("?_member_level ml ON ml.level_id = m.member_level".replace("?_", this.appConfig.tablePrefix));
queryWrapper.select("member_id, m.site_id, username, member_no, mobile, register_channel, nickname, headimg, member_level, member_label, login_ip, login_type, login_time, m.create_time, last_visit_time, last_consum_time, sex, m.status, birthday, point, balance, m.growth, is_member, member_time, is_del, province_id, city_id, district_id, address, location, money, money_get, wx_openid, weapp_openid, commission, commission_get, commission_cash_outing, ml.level_name as member_level_name"); queryWrapper.select("member_id, m.site_id, username, member_no, mobile, register_channel, nickname, headimg, member_level, member_label, login_ip, login_type, login_time, m.create_time, last_visit_time, last_consum_time, sex, m.status, birthday, point, balance, m.growth, is_member, member_time, is_del, province_id, city_id, district_id, address, location, money, money_get, wx_openid, weapp_openid, commission, commission_get, commission_cash_outing, ml.level_name as member_level_name");
queryWrapper.eq("member_id", param.memberId()); queryWrapper.eq("member_id", param.memberId());
@@ -32,15 +32,15 @@ export class MemberServiceImplService {
const memberInfoVo: MemberInfoVo = memberMapper.selectJoinOne(MemberInfoVo.class, queryWrapper); const memberInfoVo: MemberInfoVo = memberMapper.selectJoinOne(MemberInfoVo.class, queryWrapper);
if (CommonUtils.isNotEmpty(memberInfoVo)){ if (CommonUtils.isNotEmpty(memberInfoVo)){
const memberConfig: MemberConfigVo = this.coreMemberConfigService.getMemberConfig(memberInfoVo.siteId); const memberConfig: MemberConfigVo = this.coreMemberConfigService.getMemberConfig(memberInfoVo.siteId);
memberInfoVo.setFormId(memberConfig.formId == null ? "" : memberConfig.formId.toString()); memberInfoVo.formId = memberConfig.formId == null ? "" : memberConfig.formId.toString();
memberInfoVo.setFormRecordId(""); memberInfoVo.formRecordId = "";
if (StringUtils.isNotEmpty(memberInfoVo.formId)){ if (StringUtils.isNotEmpty(memberInfoVo.formId)){
const diyFormRecords: DiyFormRecords = this.diyFormRecordsRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) const diyFormRecords: DiyFormRecords = this.diyFormRecordsRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
.eq(DiyFormRecords::getFormId, memberConfig.formId) .eq(DiyFormRecords::getFormId, memberConfig.formId)
.eq(DiyFormRecords::getMemberId, memberInfoVo.memberId) .eq(DiyFormRecords::getMemberId, memberInfoVo.memberId)
.orderByDesc(DiyFormRecords::getCreateTime)); .orderByDesc(DiyFormRecords::getCreateTime));
if (CommonUtils.isNotEmpty(diyFormRecords)){ if (CommonUtils.isNotEmpty(diyFormRecords)){
memberInfoVo.setFormRecordId(diyFormRecords.getRecordId().toString()); memberInfoVo.formRecordId = diyFormRecords.recordId.toString();
} }
} }
} }
@@ -75,24 +75,24 @@ export class MemberServiceImplService {
const newMember: Member = new Member(); const newMember: Member = new Member();
newMember.memberId = oldMember.memberId; newMember.memberId = oldMember.memberId;
switch (param.getField()) { switch (param.field) {
case "nickname": case "nickname":
newMember.setNickname(String(param.value)); newMember.nickname = String(param.value);
break; break;
case "headimg": case "headimg":
newMember.setHeadimg(String(param.value)); newMember.headimg = String(param.value);
break; break;
case "member_label": case "member_label":
newMember.setMemberLabel(String(param.value)); newMember.memberLabel = String(param.value);
break; break;
case "member_level": case "member_level":
newMember.setMemberLevel(number.parseInt(String(param.value))); newMember.memberLevel = number.parseInt(String(param.value));
break; break;
case "birthday": case "birthday":
newMember.setBirthday(String(param.value)); newMember.birthday = String(param.value);
break; break;
case "sex": case "sex":
newMember.setSex(number.parseInt(String(param.value))); newMember.sex = number.parseInt(String(param.value));
break; break;
default: default:
throw new BadRequestException("不允许修改的信息"); throw new BadRequestException("不允许修改的信息");
@@ -109,11 +109,11 @@ export class MemberServiceImplService {
const newMember: Member = new Member(); const newMember: Member = new Member();
newMember.memberId = oldMember.memberId; newMember.memberId = oldMember.memberId;
if (CommonUtils.isNotEmpty(param.data.getNickname())) newMember.setNickname(param.data.getNickname()); if (CommonUtils.isNotEmpty(param.data.getNickname())) newMember.nickname = param.data.getNickname();
if (CommonUtils.isNotEmpty(param.data.getHeadimg())) newMember.setHeadimg(param.data.getHeadimg()); if (CommonUtils.isNotEmpty(param.data.getHeadimg())) newMember.headimg = param.data.getHeadimg();
if (CommonUtils.isNotEmpty(param.data.getBirthday())) newMember.setBirthday(param.data.getBirthday()); if (CommonUtils.isNotEmpty(param.data.getBirthday())) newMember.birthday = param.data.getBirthday();
if (CommonUtils.isNotEmpty(param.data.getSex())) newMember.setSex(param.data.getSex()); if (CommonUtils.isNotEmpty(param.data.getSex())) newMember.sex = param.data.getSex();
if (CommonUtils.isNotEmpty(param.data.getLastVisitTime())) newMember.setLastVisitTime(param.data.getLastVisitTime()); if (CommonUtils.isNotEmpty(param.data.getLastVisitTime())) newMember.lastVisitTime = param.data.getLastVisitTime();
return this.memberMapper.updateById(newMember); return this.memberMapper.updateById(newMember);
} }
@@ -124,12 +124,12 @@ export class MemberServiceImplService {
const oldMember: Member = this.memberMapper.selectById(param.memberId()); const oldMember: Member = this.memberMapper.selectById(param.memberId());
if (!oldMember) throw new BadRequestException("会员不存在"); if (!oldMember) throw new BadRequestException("会员不存在");
if (CommonUtils.isNotEmpty(param.getMobile())) { if (CommonUtils.isNotEmpty(param.mobile)) {
this.registerService.checkMobileCode(param.getMobile(), param.getMobileKey(), param.getMobileCode()); this.registerService.checkMobileCode(param.mobile, param.mobileKey, param.mobileCode);
} else if (CommonUtils.isNotEmpty(param.getMobileCode())) { } else if (CommonUtils.isNotEmpty(param.mobileCode)) {
try { try {
const phoneInfo: WxMaPhoneNumberInfo = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getPhoneNoInfo(param.getMobileCode()); const phoneInfo: WxMaPhoneNumberInfo = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getPhoneNoInfo(param.mobileCode);
param.setMobile(phoneInfo.getPurePhoneNumber()); param.mobile = phoneInfo.purePhoneNumber;
} catch (e) { } catch (e) {
throw new BadRequestException(e.message); throw new BadRequestException(e.message);
} }
@@ -137,12 +137,12 @@ export class MemberServiceImplService {
throw new BadRequestException("手机号不存在"); throw new BadRequestException("手机号不存在");
} }
const mobileExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", param.getMobile()).eq("site_id", this.requestContext.siteId)); const mobileExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", param.mobile).eq("site_id", this.requestContext.siteId));
if (ObjectUtil.isNotNull(mobileExist)) throw new BadRequestException("当前手机号已绑定账号"); if (ObjectUtil.isNotNull(mobileExist)) throw new BadRequestException("当前手机号已绑定账号");
const newMember: Member = new Member(); const newMember: Member = new Member();
newMember.memberId = param.memberId(); newMember.memberId = param.memberId();
newMember.setMobile(param.getMobile()); newMember.mobile = param.mobile;
return this.memberMapper.updateById(newMember); return this.memberMapper.updateById(newMember);
} }
@@ -153,7 +153,7 @@ export class MemberServiceImplService {
async log(param: MemberLogParam): Promise<any> { async log(param: MemberLogParam): Promise<any> {
const updateMember: Member = new Member(); const updateMember: Member = new Member();
updateMember.memberId = param.memberId(); updateMember.memberId = param.memberId();
updateMember.setLastVisitTime(DateUtils.currTime()); updateMember.lastVisitTime = DateUtils.currTime();
this.memberMapper.updateById(updateMember); this.memberMapper.updateById(updateMember);
return 1; return 1;
} }

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

@@ -41,7 +41,7 @@ export class MemberSignServiceImplService {
async signDetails(param: MemberSignDetailsParam): Promise<any> { async signDetails(param: MemberSignDetailsParam): Promise<any> {
const queryWrapper: QueryWrapper = new QueryWrapper(); const queryWrapper: QueryWrapper = new QueryWrapper();
queryWrapper.select("sign_id, site_id, member_id, days, day_award, continue_award, continue_tag, create_time, is_sign"); queryWrapper.select("sign_id, site_id, member_id, days, day_award, continue_award, continue_tag, create_time, is_sign");
queryWrapper.eq("sign_id", param.getSignId()); queryWrapper.eq("sign_id", param.signId);
queryWrapper.eq("site_id", param.siteId()); queryWrapper.eq("site_id", param.siteId());
queryWrapper.eq("member_id", param.memberId()); queryWrapper.eq("member_id", param.memberId());
const memberSignList: MemberSign[] = this.this.memberSignRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }); const memberSignList: MemberSign[] = this.this.memberSignRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
@@ -60,28 +60,28 @@ export class MemberSignServiceImplService {
const signConfig: Record<string, any> = this.coreConfigService.getConfigValue(this.requestContext.siteId, "SIGN_CONFIG"); const signConfig: Record<string, any> = this.coreConfigService.getConfigValue(this.requestContext.siteId, "SIGN_CONFIG");
const config: MemberSignConfigVo = Object.assign(new MemberSignConfigVo(), signConfig) /* TODO: 检查MemberSignConfigVo构造函数 */; const config: MemberSignConfigVo = Object.assign(new MemberSignConfigVo(), signConfig) /* TODO: 检查MemberSignConfigVo构造函数 */;
if (!config.getIsUse()) throw new Error("签到未开启"); if (!config.isUse) throw new Error("签到未开启");
// 获取今天的签到 // 获取今天的签到
const todayMemberSign: MemberSign = this.queryMemberSign(param.siteId(), param.memberId(), DateUtils.getFormatTodayString()); const todayMemberSign: MemberSign = this.queryMemberSign(param.siteId(), param.memberId(), DateUtils.formatTodayString);
if (todayMemberSign != null) throw new Error("今日已签到"); if (todayMemberSign != null) throw new Error("今日已签到");
const vo: MemberSignOperateVo = new MemberSignOperateVo(); const vo: MemberSignOperateVo = new MemberSignOperateVo();
vo.title = "签到成功"; vo.title = "签到成功";
vo.setInfo("恭喜您获得以下奖励"); vo.info = "恭喜您获得以下奖励";
// 获取昨天的签到 // 获取昨天的签到
const yesterdayMemberSign: MemberSign = this.queryMemberSign(param.siteId(), param.memberId(), DateUtils.getFormatYesterdayString()); const yesterdayMemberSign: MemberSign = this.queryMemberSign(param.siteId(), param.memberId(), DateUtils.formatYesterdayString);
const days: number = 1; const days: number = 1;
if (yesterdayMemberSign != null) { if (yesterdayMemberSign != null) {
//连签天数大于签到周期，连签天数重置为1 //连签天数大于签到周期，连签天数重置为1
days = yesterdayMemberSign.getDays() + 1; days = yesterdayMemberSign.days + 1;
if (days > config.getSignPeriod()) { if (days > config.signPeriod) {
days = 1; days = 1;
} }
if (CommonUtils.isNotEmpty(config.getContinueAward())) { if (CommonUtils.isNotEmpty(config.continueAward)) {
const continueSigns: JSONArray = config.getContinueAward(); const continueSigns: JSONArray = config.continueAward;
CollUtil.sort(continueSigns, Comparator.comparing(o => ((Record<string, any>) o).getInt("continue_sign")).reversed()); CollUtil.sort(continueSigns, Comparator.comparing(o => ((Record<string, any>) o).getInt("continue_sign")).reversed());
// 获取最大的连签天数 // 获取最大的连签天数
const maxContinueSign: number = continueSigns.getRecord<string, any>(0).getInt("continue_sign"); const maxContinueSign: number = continueSigns.getRecord<string, any>(0).getInt("continue_sign");
@@ -95,26 +95,26 @@ export class MemberSignServiceImplService {
const model: MemberSign = new MemberSign(); const model: MemberSign = new MemberSign();
model.siteId = param.siteId(); model.siteId = param.siteId();
model.memberId = param.memberId(); model.memberId = param.memberId();
model.setIsSign(1); model.isSign = 1;
model.createTime = Date.now( / 1000); model.createTime = Date.now( / 1000);
model.setDays(days); model.days = days;
model.setDayAward(config.getDayAward().toString()); model.dayAward = config.dayAward.toString();
model.setContinueAward(""); model.continueAward = "";
if (days === 1) model.setStartTime(Date.now() / 1000); if (days === 1) model.startTime = Date.now( / 1000);
this.memberSignRepository.save(model); this.memberSignRepository.save(model);
// 发放日签奖励 // 发放日签奖励
const dayAwardVar: Record<String, Object> = {}; const dayAwardVar: Record<String, Object> = {};
dayAwardVar.put("from_type", "day_sign_award"); dayAwardVar.put("from_type", "day_sign_award");
dayAwardVar.put("memo", "日签奖励"); dayAwardVar.put("memo", "日签奖励");
this.coreMemberService.memberGiftGrant(param.siteId(), param.memberId(), config.getDayAward(), dayAwardVar); this.coreMemberService.memberGiftGrant(param.siteId(), param.memberId(), config.dayAward, dayAwardVar);
vo.setAwards(this.coreMemberService.getGiftContent(param.siteId(), config.getDayAward(), "member_sign")); vo.awards = this.coreMemberService.getGiftContent(param.siteId(, config.dayAward, "member_sign"));
// 发放连签奖励 // 发放连签奖励
if (config.getContinueAward().size() > 0) { if (config.continueAward.size() > 0) {
const continueAward: Record<string, any> = null; const continueAward: Record<string, any> = null;
for (const i of number = 0; i < config.getContinueAward().size(); i++) { for (const i of number = 0; i < config.continueAward.size(); i++) {
const item: Record<string, any> = config.getContinueAward().getRecord<string, any>(i); const item: Record<string, any> = config.continueAward.getRecord<string, any>(i);
if (item.getInt("continue_sign").equals(days)) { if (item.getInt("continue_sign").equals(days)) {
// 是否限制领取 // 是否限制领取
if (item.getInt("receive_limit").equals(2)) { if (item.getInt("receive_limit").equals(2)) {
@@ -128,7 +128,7 @@ export class MemberSignServiceImplService {
.last("limit 1") .last("limit 1")
).getStartTime(); ).getStartTime();
// 周期结束时间 // 周期结束时间
const periodEndTime: number = periodStartTime + (config.getSignPeriod() * 86400); const periodEndTime: number = periodStartTime + (config.signPeriod * 86400);
// 领取次数 // 领取次数
const receiveNum: number = this.memberSignRepository.count({ /* TODO: 将QueryWrapper改为where条件 */ })) const receiveNum: number = this.memberSignRepository.count({ /* TODO: 将QueryWrapper改为where条件 */ }))
.eq("site_id", param.siteId()) .eq("site_id", param.siteId())
@@ -146,7 +146,7 @@ export class MemberSignServiceImplService {
} }
if (continueAward != null) { if (continueAward != null) {
model.setContinueTag(continueAward.getStr("continue_tag")); model.continueTag = continueAward.getStr("continue_tag");
continueAward.remove("continue_sign"); continueAward.remove("continue_sign");
continueAward.remove("continue_tag"); continueAward.remove("continue_tag");
continueAward.remove("receive_limit"); continueAward.remove("receive_limit");
@@ -157,11 +157,11 @@ export class MemberSignServiceImplService {
continueAwardVar.put("memo", "连签奖励"); continueAwardVar.put("memo", "连签奖励");
this.coreMemberService.memberGiftGrant(param.siteId(), param.memberId(), continueAward, continueAwardVar); this.coreMemberService.memberGiftGrant(param.siteId(), param.memberId(), continueAward, continueAwardVar);
model.setContinueAward(continueAward.toString()); model.continueAward = continueAward.toString();
memberSignMapper.updateById(model); memberSignMapper.updateById(model);
vo.setInfo("连签" + days.toString() + "天恭喜您获得以下奖励"); vo.info = "连签" + days.toString( + "天恭喜您获得以下奖励");
vo.setAwards(this.coreMemberService.getGiftContent(param.siteId(), continueAward, "member_sign")); vo.awards = this.coreMemberService.getGiftContent(param.siteId(, continueAward, "member_sign"));
} }
} }
@@ -176,7 +176,7 @@ export class MemberSignServiceImplService {
const days: number[] = []; const days: number[] = [];
const period: MemberSignMonthRecordVo.Period[] = []; const period: MemberSignMonthRecordVo.Period[] = [];
const date: Date = DateUtil.parse(param.getYear() + "-" + param.getMonth() + "-1"); const date: Date = DateUtil.parse(param.year + "-" + param.month + "-1");
const signRecord: MemberSign[] = this.this.memberSignRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) const signRecord: MemberSign[] = this.this.memberSignRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))
.between("create_time", .between("create_time",
@@ -190,8 +190,8 @@ export class MemberSignServiceImplService {
} }
} }
vo.setDays(days); vo.days = days;
vo.setPeriod(period); vo.period = period;
return vo; return vo;
} }
@@ -209,14 +209,14 @@ export class MemberSignServiceImplService {
const config: Record<string, any> = this.coreConfigService.getConfigValue(this.requestContext.siteId, "SIGN_CONFIG"); const config: Record<string, any> = this.coreConfigService.getConfigValue(this.requestContext.siteId, "SIGN_CONFIG");
const signConfig: MemberSignConfigVo = Object.assign(new MemberSignConfigVo(), config) /* TODO: 检查MemberSignConfigVo构造函数 */; const signConfig: MemberSignConfigVo = Object.assign(new MemberSignConfigVo(), config) /* TODO: 检查MemberSignConfigVo构造函数 */;
if (!signConfig.getDayAward().isEmpty()) { if (!signConfig.dayAward.isEmpty()) {
signConfig.setDayAward(this.coreMemberService.getGiftContent(this.requestContext.siteId, signConfig.getDayAward(), "member_sign")); signConfig.dayAward = this.coreMemberService.getGiftContent(this.requestContext.siteId, signConfig.dayAward, "member_sign");
} }
if (!signConfig.getContinueAward().isEmpty()) { if (!signConfig.continueAward.isEmpty()) {
const continueAward: JSONArray = new JSONArray(); const continueAward: JSONArray = new JSONArray();
for (const i of number = 0; i < signConfig.getContinueAward().size(); i++) { for (const i of number = 0; i < signConfig.continueAward.size(); i++) {
const awardItem: Record<string, any> = new Record<string, any>(); const awardItem: Record<string, any> = new Record<string, any>();
const item: Record<string, any> = signConfig.getContinueAward().getRecord<string, any>(i); const item: Record<string, any> = signConfig.continueAward.getRecord<string, any>(i);
awardItem.set("continue_sign", item.get("continue_sign")); awardItem.set("continue_sign", item.get("continue_sign"));
item.remove("continue_sign"); item.remove("continue_sign");
@@ -244,19 +244,19 @@ export class MemberSignServiceImplService {
awardItem.set("gift", new Record<string, any>().set("total", gift)); awardItem.set("gift", new Record<string, any>().set("total", gift));
continueAward.push(awardItem); continueAward.push(awardItem);
} }
signConfig.setContinueAward(continueAward); signConfig.continueAward = continueAward;
} }
// 获取今天的签到 // 获取今天的签到
const todayMemberSign: MemberSign = this.queryMemberSign(param.siteId(), param.memberId(), DateUtils.getFormatTodayString()); const todayMemberSign: MemberSign = this.queryMemberSign(param.siteId(), param.memberId(), DateUtils.formatTodayString);
signConfig.setIsSign(todayMemberSign == null ? false : true); signConfig.isSign = todayMemberSign == null ? false : true;
// 获取昨天的签到 // 获取昨天的签到
const yesterdayMemberSign: MemberSign = this.queryMemberSign(param.siteId(), param.memberId(), DateUtils.getFormatYesterdayString()); const yesterdayMemberSign: MemberSign = this.queryMemberSign(param.siteId(), param.memberId(), DateUtils.formatYesterdayString);
if (todayMemberSign == null) { if (todayMemberSign == null) {
signConfig.setDays(yesterdayMemberSign == null ? 0 : yesterdayMemberSign.getDays()); signConfig.days = yesterdayMemberSign == null ? 0 : yesterdayMemberSign.days;
} else { } else {
signConfig.setDays(todayMemberSign.getDays()); signConfig.days = todayMemberSign.days;
} }
return signConfig; return signConfig;
} }

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

@@ -19,16 +19,16 @@ export class PayServiceImplService {
*/ */
async pay(param: PayParam): Promise<any> { async pay(param: PayParam): Promise<any> {
param.siteId = this.requestContext.siteId; param.siteId = this.requestContext.siteId;
param.setChannel(RequestUtils.channel()); param.channel = RequestUtils.channel();
param.setBuyerId(this.requestContext.memberId); param.buyerId = this.requestContext.memberId;
if (RequestUtils.channel() === ChannelEnum.WECHAT.getCode() && param.getOpenid().isEmpty()) { if (RequestUtils.channel() === ChannelEnum.WECHAT.code && param.openid.isEmpty()) {
const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_id", param.siteId).eq("member_id", this.requestContext.memberId)); const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_id", param.siteId).eq("member_id", this.requestContext.memberId));
param.setOpenid(ObjectUtil.defaultIfNull(member.getWxOpenid(), "")); param.openid = ObjectUtil.defaultIfNull(member.wxOpenid, "");
} }
if (RequestUtils.channel() === ChannelEnum.WEAPP.getCode() && param.getOpenid().isEmpty()) { if (RequestUtils.channel() === ChannelEnum.WEAPP.code && param.openid.isEmpty()) {
const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_id", param.siteId).eq("member_id", this.requestContext.memberId)); const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_id", param.siteId).eq("member_id", this.requestContext.memberId));
param.setOpenid(ObjectUtil.defaultIfNull(member.getWeappOpenid(), "")); param.openid = ObjectUtil.defaultIfNull(member.weappOpenid, "");
} }
return this.corePayService.pay(param); return this.corePayService.pay(param);
@@ -67,24 +67,24 @@ export class PayServiceImplService {
const vo: FriendspayInfoVo = new FriendspayInfoVo(); const vo: FriendspayInfoVo = new FriendspayInfoVo();
BeanUtil.copyProperties(payInfo, vo); BeanUtil.copyProperties(payInfo, vo);
vo.setConfig(payInfo.config); vo.config = payInfo.config;
vo.setPayTypeList(payInfo.getPayTypeList()); vo.payTypeList = payInfo.payTypeList;
vo.createTime = DateUtils.timestampToString(payInfo.createTime); vo.createTime = DateUtils.timestampToString(payInfo.createTime);
if (payInfo.getPayTime() != 0) { if (payInfo.payTime != 0) {
vo.setPayTime(DateUtils.timestampToString(payInfo.getPayTime())); vo.payTime = DateUtils.timestampToString(payInfo.payTime);
} }
if (payInfo.getCancelTime() != 0) { if (payInfo.cancelTime != 0) {
vo.setCancelTime(DateUtils.timestampToString(payInfo.getCancelTime())); vo.cancelTime = DateUtils.timestampToString(payInfo.cancelTime);
} }
PayTradeInfoDefiner.const event: PayTradeInfoEvent = new PayTradeInfoDefiner.PayTradeInfoEvent(tradeType, tradeId); PayTradeInfoDefiner.const event: PayTradeInfoEvent = new PayTradeInfoDefiner.PayTradeInfoEvent(tradeType, tradeId);
const trades: PayTradeInfoDefiner.PayTradeInfoEventResult[] = EventAndSubscribeOfPublisher.publishAndCallback(event); const trades: PayTradeInfoDefiner.PayTradeInfoEventResult[] = EventAndSubscribeOfPublisher.publishAndCallback(event);
if (CommonUtils.isNotEmpty(trades)) { if (CommonUtils.isNotEmpty(trades)) {
vo.setTradeInfo(trades.get(0).getJsonObject()); vo.tradeInfo = trades.get(0.getJsonObject());
} }
vo.setSelf(payInfo.getMainId() === this.requestContext.memberId); vo.self = payInfo.mainId === this.requestContext.memberId;
any /* TODO: QueryWrapper<SysPoster> */ posterQueryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<SysPoster> */ posterQueryWrapper = new QueryWrapper();
posterQueryWrapper.eq("site_id", this.requestContext.siteId) posterQueryWrapper.eq("site_id", this.requestContext.siteId)
@@ -93,11 +93,11 @@ export class PayServiceImplService {
.eq("is_default", 1); .eq("is_default", 1);
const sysPoster: SysPoster = this.sysPosterRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }); const sysPoster: SysPoster = this.sysPosterRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
if (CommonUtils.isNotEmpty(sysPoster)) { if (CommonUtils.isNotEmpty(sysPoster)) {
vo.setPosterId(sysPoster.id); vo.posterId = sysPoster.id;
} }
const member: Member = memberMapper.selectById(payInfo.getMainId()); const member: Member = memberMapper.selectById(payInfo.mainId);
vo.setMember(member); vo.member = member;
return vo; return vo;
} }
} }

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

@@ -20,7 +20,7 @@ export class SysAreaServiceImplService {
*/ */
async getAreaById(id: number): Promise<any> { async getAreaById(id: number): Promise<any> {
// 缓存分组名称 // 缓存分组名称
const group: string = SysArea.class.getSimpleName(); const group: string = SysArea.class.simpleName;
// 缓存Key值计算参数 // 缓存Key值计算参数
const paramList: Object[] = [id]; const paramList: Object[] = [id];
// 自动缓存 // 自动缓存
@@ -36,7 +36,7 @@ export class SysAreaServiceImplService {
*/ */
async getListByPid(pid: number): Promise<any> { async getListByPid(pid: number): Promise<any> {
// 缓存分组名称 // 缓存分组名称
const group: string = SysAreaListVo.class.getSimpleName(); const group: string = SysAreaListVo.class.simpleName;
// 缓存Key值计算参数 // 缓存Key值计算参数
const paramList: Object[] = [pid]; const paramList: Object[] = [pid];
// 自动缓存 // 自动缓存
@@ -97,20 +97,20 @@ export class SysAreaServiceImplService {
const sysArea: SysArea = this.sysAreaMapper.selectById(code); const sysArea: SysArea = this.sysAreaMapper.selectById(code);
const jsonObject: Record<string, any> = new Record<string, any>(); const jsonObject: Record<string, any> = new Record<string, any>();
if (sysArea != null) { if (sysArea != null) {
if (sysArea.getLevel() == 1) { if (sysArea.level == 1) {
jsonObject.putOpt("province", convertJsonObject(sysArea)); jsonObject.putOpt("province", convertJsonObject(sysArea));
} else if (sysArea.getLevel() == 2) { } else if (sysArea.level == 2) {
jsonObject.putOpt("city", convertJsonObject(sysArea)); jsonObject.putOpt("city", convertJsonObject(sysArea));
const provinceSysArea: SysArea = this.sysAreaMapper.selectById(sysArea.getPid()); const provinceSysArea: SysArea = this.sysAreaMapper.selectById(sysArea.pid);
if (provinceSysArea != null) { if (provinceSysArea != null) {
jsonObject.putOpt("province", convertJsonObject(provinceSysArea)); jsonObject.putOpt("province", convertJsonObject(provinceSysArea));
} }
} else if (sysArea.getLevel() == 3) { } else if (sysArea.level == 3) {
jsonObject.putOpt("district", convertJsonObject(sysArea)); jsonObject.putOpt("district", convertJsonObject(sysArea));
const citySysArea: SysArea = this.sysAreaMapper.selectById(sysArea.getPid()); const citySysArea: SysArea = this.sysAreaMapper.selectById(sysArea.pid);
if (citySysArea != null) { if (citySysArea != null) {
jsonObject.putOpt("city", convertJsonObject(citySysArea)); jsonObject.putOpt("city", convertJsonObject(citySysArea));
const provinceSysArea: SysArea = this.sysAreaMapper.selectById(citySysArea.getPid()); const provinceSysArea: SysArea = this.sysAreaMapper.selectById(citySysArea.pid);
if (provinceSysArea != null) { if (provinceSysArea != null) {
jsonObject.putOpt("province", convertJsonObject(provinceSysArea)); jsonObject.putOpt("province", convertJsonObject(provinceSysArea));
} }
@@ -126,7 +126,7 @@ export class SysAreaServiceImplService {
async getAddressByLatlng(param: SysAreaAddressByLatlngParam): Promise<any> { async getAddressByLatlng(param: SysAreaAddressByLatlngParam): Promise<any> {
const sysMapVo: SysMapVo = this.coreSysConfigService.getMap(param.siteId()); const sysMapVo: SysMapVo = this.coreSysConfigService.getMap(param.siteId());
const key: string = sysMapVo.key; const key: string = sysMapVo.key;
const addressJsonString: string = TencentGeocoder.getAddress(key, param.getLatlng(), param.getGetPoi()); const addressJsonString: string = TencentGeocoder.getAddress(key, param.latlng, param.getPoi);
const jsonObjectResult: Record<string, any> = TencentGeocoder.formatData(addressJsonString); const jsonObjectResult: Record<string, any> = TencentGeocoder.formatData(addressJsonString);
const province: string = jsonObjectResult.getStr("province"); const province: string = jsonObjectResult.getStr("province");
jsonObjectResult.putOpt("province_id", this.queryCodeByNameAndLevel(province, 1)); jsonObjectResult.putOpt("province_id", this.queryCodeByNameAndLevel(province, 1));

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

@@ -30,9 +30,9 @@ export class SysVerifyServiceImplService {
const sysVerifyGetCodeVoList: SysVerifyGetCodeVo[] = []; const sysVerifyGetCodeVoList: SysVerifyGetCodeVo[] = [];
for (const verifyCode of verifyCodeList) { for (const verifyCode of verifyCodeList) {
const sysVerifyGetCodeVo: SysVerifyGetCodeVo = new SysVerifyGetCodeVo(); const sysVerifyGetCodeVo: SysVerifyGetCodeVo = new SysVerifyGetCodeVo();
sysVerifyGetCodeVo.setCode(verifyCode); sysVerifyGetCodeVo.code = verifyCode;
sysVerifyGetCodeVo.setQrcode(QrcodeUtils.qrcode(param.siteId(), "h5", verifyCode, "", null)); sysVerifyGetCodeVo.qrcode = QrcodeUtils.qrcode(param.siteId(, "h5", verifyCode, "", null));
if (param.getNeedBarcode() == 1){ if (param.needBarcode == 1){
const barcode: string = null; const barcode: string = null;
try { try {
const qrcodeDir: string = this.appConfig.webRootDownResource + "upload/temp/"; const qrcodeDir: string = this.appConfig.webRootDownResource + "upload/temp/";
@@ -42,7 +42,7 @@ export class SysVerifyServiceImplService {
log.error("条形码生成失败:{}", e.message, e); log.error("条形码生成失败:{}", e.message, e);
throw new BadRequestException("条形码生成失败"); throw new BadRequestException("条形码生成失败");
} }
sysVerifyGetCodeVo.setBarcode(barcode); sysVerifyGetCodeVo.barcode = barcode;
} }
sysVerifyGetCodeVoList.push(sysVerifyGetCodeVo); sysVerifyGetCodeVoList.push(sysVerifyGetCodeVo);
} }
@@ -70,8 +70,8 @@ export class SysVerifyServiceImplService {
queryWrapper.eq("site_id", param.siteId()); queryWrapper.eq("site_id", param.siteId());
queryWrapper.eq("verifier_member_id", param.memberId()); queryWrapper.eq("verifier_member_id", param.memberId());
if (StrUtil.isNotEmpty(param.getCode())) { if (StrUtil.isNotEmpty(param.code)) {
queryWrapper.eq("code", param.getCode()); queryWrapper.eq("code", param.code);
} }
if (StrUtil.isNotEmpty(param.type)) { if (StrUtil.isNotEmpty(param.type)) {
queryWrapper.eq("type", param.type); queryWrapper.eq("type", param.type);
@@ -79,8 +79,8 @@ export class SysVerifyServiceImplService {
if (CommonUtils.isNotEmpty(param.createTime)) { if (CommonUtils.isNotEmpty(param.createTime)) {
QueryMapperUtils.buildByTime(queryWrapper, "create_time", param.createTime); QueryMapperUtils.buildByTime(queryWrapper, "create_time", param.createTime);
} }
if (StrUtil.isNotEmpty(param.getRelateTag())) { if (StrUtil.isNotEmpty(param.relateTag)) {
queryWrapper.eq("relate_tag", param.getRelateTag()); queryWrapper.eq("relate_tag", param.relateTag);
} }
if (StrUtil.isNotEmpty(param.keyword)) { if (StrUtil.isNotEmpty(param.keyword)) {
queryWrapper.eq("keyword", param.keyword); queryWrapper.eq("keyword", param.keyword);
@@ -101,11 +101,11 @@ export class SysVerifyServiceImplService {
// 先将数据分组，然后放入结果集 // 先将数据分组，然后放入结果集
const memberMap: Record<number, Member> = ObjectGroupUtils.group(memberList, "memberId"); const memberMap: Record<number, Member> = ObjectGroupUtils.group(memberList, "memberId");
dataList.forEach(bean => { dataList.forEach(bean => {
const member: Member = memberMap.get(bean.getVerifierMemberId()); const member: Member = memberMap.get(bean.verifierMemberId);
if (member != null) { if (member != null) {
const membervo: MemberBriefInfoVo = new MemberBriefInfoVo(); const membervo: MemberBriefInfoVo = new MemberBriefInfoVo();
Object.assign(membervo, member); Object.assign(membervo, member);
bean.setMember(membervo); bean.member = membervo;
} }
}); });
} }
@@ -120,7 +120,7 @@ export class SysVerifyServiceImplService {
const limit: number = pageParam.limit; const limit: number = pageParam.limit;
MPJany /* TODO: QueryWrapper<Member> */ mpjQueryWrapper = new MPJQueryWrapper(); MPJany /* TODO: QueryWrapper<Member> */ mpjQueryWrapper = new MPJQueryWrapper();
mpjQueryWrapper.select("t.*"); mpjQueryWrapper.select("t.*");
mpjQueryWrapper.setAlias("t"); mpjQueryWrapper.alias = "t";
mpjQueryWrapper.innerJoin("?_site_group nsg ON ns.group_id = nsg.group_id"); mpjQueryWrapper.innerJoin("?_site_group nsg ON ns.group_id = nsg.group_id");
mpjQueryWrapper.eq("site_id", param.siteId()); mpjQueryWrapper.eq("site_id", param.siteId());
mpjQueryWrapper.eq("verifier_member_id", param.memberId()); mpjQueryWrapper.eq("verifier_member_id", param.memberId());
@@ -135,7 +135,7 @@ export class SysVerifyServiceImplService {
any /* TODO: QueryWrapper<Verify> */ verifyQueryWrapper = new QueryWrapper(); any /* TODO: QueryWrapper<Verify> */ verifyQueryWrapper = new QueryWrapper();
verifyQueryWrapper.eq("site_id", param.siteId()); verifyQueryWrapper.eq("site_id", param.siteId());
verifyQueryWrapper.eq("verifier_member_id", param.memberId()); verifyQueryWrapper.eq("verifier_member_id", param.memberId());
verifyQueryWrapper.eq("code", param.getCode()); verifyQueryWrapper.eq("code", param.code);
const verify: Verify = this.this.verifyRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }); const verify: Verify = this.this.verifyRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
const sysVerifyDetailVo: SysVerifyDetailVo = new SysVerifyDetailVo(); const sysVerifyDetailVo: SysVerifyDetailVo = new SysVerifyDetailVo();
if (verify != null) { if (verify != null) {
@@ -147,7 +147,7 @@ export class SysVerifyServiceImplService {
if (member != null) { if (member != null) {
const membervo: MemberBriefInfoVo = new MemberBriefInfoVo(); const membervo: MemberBriefInfoVo = new MemberBriefInfoVo();
Object.assign(membervo, member); Object.assign(membervo, member);
sysVerifyDetailVo.setMember(membervo); sysVerifyDetailVo.member = membervo;
} }
} }
@@ -183,7 +183,7 @@ export class SysVerifyServiceImplService {
*/ */
async verifyCode(param: SysVerifyCodeParam): Promise<any> { async verifyCode(param: SysVerifyCodeParam): Promise<any> {
// 1、获取核销码数据 // 1、获取核销码数据
const verifyMap: Record<String, Object> = this.getCodeData(param.getCode()); const verifyMap: Record<String, Object> = this.getCodeData(param.code);
// 检测站点数据 // 检测站点数据
if (verifyMap.get("site_id") == null || !verifyMap.get("site_id").equals(param.siteId())) { if (verifyMap.get("site_id") == null || !verifyMap.get("site_id").equals(param.siteId())) {
// 核销码已过期 // 核销码已过期
@@ -200,7 +200,7 @@ export class SysVerifyServiceImplService {
// 核销操作 // 核销操作
const verifyDataMap: Record<String, Object> = {}; const verifyDataMap: Record<String, Object> = {};
verifyDataMap.put("site_id", verifyMap.get("site_id")); verifyDataMap.put("site_id", verifyMap.get("site_id"));
verifyDataMap.put("code", param.getCode()); verifyDataMap.put("code", param.code);
verifyDataMap.put("body", verifyMap.get("body")); verifyDataMap.put("body", verifyMap.get("body"));
verifyDataMap.put("data", verifyMap.get("data")); verifyDataMap.put("data", verifyMap.get("data"));
verifyDataMap.put("value", verifyMap.get("value")); verifyDataMap.put("value", verifyMap.get("value"));
@@ -221,7 +221,7 @@ export class SysVerifyServiceImplService {
this.verifyRepository.save(model); this.verifyRepository.save(model);
// 核销码失效 // 核销码失效
this.clearCode(param.getCode()); this.clearCode(param.code);
return true; return true;
} }
} }

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

@@ -16,9 +16,9 @@ export class UploadServiceImplService {
*/ */
async image(param: AttachmentUploadParam): Promise<any> { async image(param: AttachmentUploadParam): Promise<any> {
param.siteId = this.requestContext.siteId; param.siteId = this.requestContext.siteId;
param.setIsAttachment(0); param.isAttachment = 0;
param.setAttType("image"); param.attType = "image";
param.setDir("attachment/image/" + param.siteId + "/" + DateFormatUtils.getUploadFormat() + "/"); param.dir = "attachment/image/" + param.siteId + "/" + DateFormatUtils.uploadFormat + "/";
return this.coreUploadService.upload(param); return this.coreUploadService.upload(param);
} }
@@ -27,9 +27,9 @@ export class UploadServiceImplService {
*/ */
async video(param: AttachmentUploadParam): Promise<any> { async video(param: AttachmentUploadParam): Promise<any> {
param.siteId = this.requestContext.siteId; param.siteId = this.requestContext.siteId;
param.setIsAttachment(0); param.isAttachment = 0;
param.setAttType("video"); param.attType = "video";
param.setDir("attachment/video/" + param.siteId + "/" + DateFormatUtils.getUploadFormat() + "/"); param.dir = "attachment/video/" + param.siteId + "/" + DateFormatUtils.uploadFormat + "/";
return this.coreUploadService.upload(param); return this.coreUploadService.upload(param);
} }
} }

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

@@ -17,7 +17,7 @@ export class ServeServiceImplService {
* service * service
*/ */
async service(request: HttpServletRequest, response: HttpServletResponse): Promise<any> { async service(request: HttpServletRequest, response: HttpServletResponse): Promise<any> {
response.setContentType("text/html;charset=utf-8"); response.contentType = "text/html;charset=utf-8";
response.status = HttpServletResponse.SC_OK; response.status = HttpServletResponse.SC_OK;
try { try {
@@ -27,14 +27,14 @@ export class ServeServiceImplService {
const wxMaService: WxMaService = WechatUtils.miniapp(this.requestContext.siteId); const wxMaService: WxMaService = WechatUtils.miniapp(this.requestContext.siteId);
if (!this.wxMaService.checkSignature(timestamp, nonce, signature)) { if (!this.wxMaService.checkSignature(timestamp, nonce, signature)) {
response.getWriter().println("非法请求"); response.writer.println("非法请求");
return; return;
} }
// 说明是一个仅仅用来验证的请求，回显echostr // 说明是一个仅仅用来验证的请求，回显echostr
const echostr: string = request.getParameter("echostr"); const echostr: string = request.getParameter("echostr");
if (StringUtils.isNotBlank(echostr)) { if (StringUtils.isNotBlank(echostr)) {
response.getWriter().println(echostr); response.writer.println(echostr);
return; return;
} }
@@ -44,22 +44,22 @@ export class ServeServiceImplService {
if ("raw".equals(encryptType)) { if ("raw".equals(encryptType)) {
// 明文传输的消息 // 明文传输的消息
inMessage = inMessage.fromXml(request.getInputStream()); inMessage = inMessage.fromXml(request.inputStream);
} else if ("aes".equals(encryptType)) { } else if ("aes".equals(encryptType)) {
// 是aes加密的消息 // 是aes加密的消息
const msgSignature: string = request.getParameter("msg_signature"); const msgSignature: string = request.getParameter("msg_signature");
inMessage = WxMaMessage.fromEncryptedXml(request.getInputStream(), this.wxMaService.getWxMaConfig(), timestamp, nonce, msgSignature); inMessage = WxMaMessage.fromEncryptedXml(request.inputStream, this.wxMaService.wxMaConfig, timestamp, nonce, msgSignature);
} else { } else {
response.getWriter().println("不可识别的加密类型"); response.writer.println("不可识别的加密类型");
return; return;
} }
const outMessage: WxMaXmlOutMessage = this.message(inMessage); const outMessage: WxMaXmlOutMessage = this.message(inMessage);
if (outMessage != null) { if (outMessage != null) {
if ("raw".equals(encryptType)) { if ("raw".equals(encryptType)) {
response.getWriter().write(outMessage.toXml()); response.writer.write(outMessage.toXml());
} else if ("aes".equals(encryptType)) { } else if ("aes".equals(encryptType)) {
response.getWriter().write(outMessage.toEncryptedXml(this.wxMaService.getWxMaConfig())); response.writer.write(outMessage.toEncryptedXml(this.wxMaService.wxMaConfig));
} }
return; return;
} }

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

@@ -17,14 +17,14 @@ export class WeappServiceImplService {
*/ */
async loginByCode(param: WechatAuthParam): Promise<any> { async loginByCode(param: WechatAuthParam): Promise<any> {
try { try {
const wxUser: WxMaJscode2SessionResult = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getSessionInfo(param.getCode()); const wxUser: WxMaJscode2SessionResult = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getSessionInfo(param.code);
const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId)); const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
if (ObjectUtil.isNotNull(member)) { if (ObjectUtil.isNotNull(member)) {
const vo: LoginVo = this.loginService.login(member); const vo: LoginVo = this.loginService.login(member);
return vo; return vo;
} }
if (CommonUtils.isNotEmpty(wxUser.getUnionid())) { if (CommonUtils.isNotEmpty(wxUser.unionid)) {
const unionidMember: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId)); const unionidMember: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
if (ObjectUtil.isNotNull(unionidMember)) { if (ObjectUtil.isNotNull(unionidMember)) {
const vo: LoginVo = this.loginService.login(unionidMember); const vo: LoginVo = this.loginService.login(unionidMember);
@@ -33,32 +33,32 @@ export class WeappServiceImplService {
} }
const loginVo: LoginVo = new LoginVo(); const loginVo: LoginVo = new LoginVo();
loginVo.setOpenid(wxUser.getOpenid()); loginVo.openid = wxUser.openid;
loginVo.setUnionid(ObjectUtil.defaultIfNull(wxUser.getUnionid(), "")); loginVo.unionid = ObjectUtil.defaultIfNull(wxUser.unionid, "");
const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId); const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId);
const registerParam: AuthRegisterParam = new AuthRegisterParam(); const registerParam: AuthRegisterParam = new AuthRegisterParam();
registerParam.setOpenid(wxUser.getOpenid()); registerParam.openid = wxUser.openid;
registerParam.setUnionid(ObjectUtil.defaultIfNull(wxUser.getUnionid(), "")); registerParam.unionid = ObjectUtil.defaultIfNull(wxUser.unionid, "");
registerParam.setPid(param.getPid()); registerParam.pid = param.pid;
registerParam.setHeadimg(param.getHeadimg()); registerParam.headimg = param.headimg;
registerParam.setNickname(param.getNickname()); registerParam.nickname = param.nickname;
registerParam.setMobile(param.getMobile()); registerParam.mobile = param.mobile;
registerParam.setMobileCode(param.getMobileCode()); registerParam.mobileCode = param.mobileCode;
// 开启自动注册会员 // 开启自动注册会员
if (config.getIsAuthRegister() == 1) { if (config.isAuthRegister == 1) {
if (config.getIsBindMobile() == 1 && config.getIsForceAccessUserInfo() == 1) { if (config.isBindMobile == 1 && config.isForceAccessUserInfo == 1) {
if (CommonUtils.isNotEmpty(param.getMobile()) && CommonUtils.isNotEmpty(param.getHeadimg()) && CommonUtils.isNotEmpty(param.getNickname())) { if (CommonUtils.isNotEmpty(param.mobile) && CommonUtils.isNotEmpty(param.headimg) && CommonUtils.isNotEmpty(param.nickname)) {
return this.register(registerParam); return this.register(registerParam);
} }
} else if (config.getIsForceAccessUserInfo() == 1) { } else if (config.isForceAccessUserInfo == 1) {
if (CommonUtils.isNotEmpty(param.getHeadimg()) && CommonUtils.isNotEmpty(param.getNickname())) { if (CommonUtils.isNotEmpty(param.headimg) && CommonUtils.isNotEmpty(param.nickname)) {
return this.register(registerParam); return this.register(registerParam);
} }
} else if (config.getIsBindMobile() == 1) { } else if (config.isBindMobile == 1) {
if (CommonUtils.isNotEmpty(param.getMobile()) || CommonUtils.isNotEmpty(param.getMobileCode())) { if (CommonUtils.isNotEmpty(param.mobile) || CommonUtils.isNotEmpty(param.mobileCode)) {
return this.register(registerParam); return this.register(registerParam);
} }
} else { } else {
@@ -66,8 +66,8 @@ export class WeappServiceImplService {
} }
} else { } else {
// 关闭自动注册，但是开启了强制绑定手机号，必须获取手机号才能进行注册 // 关闭自动注册，但是开启了强制绑定手机号，必须获取手机号才能进行注册
if (config.getIsBindMobile() == 1 || config.getIsMobile() == 1) { if (config.isBindMobile == 1 || config.isMobile == 1) {
if (CommonUtils.isNotEmpty(param.getMobile()) || CommonUtils.isNotEmpty(param.getMobileCode())) { if (CommonUtils.isNotEmpty(param.mobile) || CommonUtils.isNotEmpty(param.mobileCode)) {
return this.register(registerParam); return this.register(registerParam);
} }
} }
@@ -83,22 +83,22 @@ export class WeappServiceImplService {
* register * register
*/ */
async register(param: AuthRegisterParam): Promise<any> { async register(param: AuthRegisterParam): Promise<any> {
if (param.getOpenid().isEmpty()) throw new BadRequestException("openid不能为空"); if (param.openid.isEmpty()) throw new BadRequestException("openid不能为空");
try { try {
const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId)); const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
if (ObjectUtil.isNotNull(member)) throw new BadRequestException("账号已存在"); if (ObjectUtil.isNotNull(member)) throw new BadRequestException("账号已存在");
if (!param.getUnionid().isEmpty()) { if (!param.unionid.isEmpty()) {
const unionidMember: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId)); const unionidMember: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
if (ObjectUtil.isNotNull(unionidMember)) throw new BadRequestException("账号已存在"); if (ObjectUtil.isNotNull(unionidMember)) throw new BadRequestException("账号已存在");
} }
const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId); const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId);
if (config.getIsBindMobile() == 1) { if (config.isBindMobile == 1) {
if (!param.getMobile().isEmpty() || !param.getMobileCode().isEmpty()) { if (!param.mobile.isEmpty() || !param.mobileCode.isEmpty()) {
if (!param.getMobileCode().isEmpty()) { if (!param.mobileCode.isEmpty()) {
const phoneInfo: WxMaPhoneNumberInfo = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getPhoneNoInfo(param.getMobileCode()); const phoneInfo: WxMaPhoneNumberInfo = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getPhoneNoInfo(param.mobileCode);
param.setMobile(phoneInfo.getPurePhoneNumber()); param.mobile = phoneInfo.purePhoneNumber;
} }
} else { } else {
throw new BadRequestException("手机号不能为空"); throw new BadRequestException("手机号不能为空");
@@ -106,12 +106,12 @@ export class WeappServiceImplService {
} }
const registerMember: Member = new Member(); const registerMember: Member = new Member();
registerMember.setWeappOpenid(param.getOpenid()); registerMember.weappOpenid = param.openid;
registerMember.setMobile(param.getMobile()); registerMember.mobile = param.mobile;
registerMember.setWxUnionid(param.getUnionid()); registerMember.wxUnionid = param.unionid;
registerMember.setPid(param.getPid()); registerMember.pid = param.pid;
registerMember.setNickname(param.getNickname()); registerMember.nickname = param.nickname;
registerMember.setHeadimg(param.getHeadimg()); registerMember.headimg = param.headimg;
return this.registerService.register(registerMember); return this.registerService.register(registerMember);
} catch (e) { } catch (e) {
throw new BadRequestException(e.message); throw new BadRequestException(e.message);
@@ -123,14 +123,14 @@ export class WeappServiceImplService {
*/ */
async updateOpenid(param: WechatAuthParam): Promise<any> { async updateOpenid(param: WechatAuthParam): Promise<any> {
try { try {
const wxUser: WxMaJscode2SessionResult = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getSessionInfo(param.getCode()); const wxUser: WxMaJscode2SessionResult = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getSessionInfo(param.code);
const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId)); const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
if (ObjectUtil.isNotNull(member)) throw new BadRequestException("账号已存在"); if (ObjectUtil.isNotNull(member)) throw new BadRequestException("账号已存在");
const updateMember: Member = new Member(); const updateMember: Member = new Member();
updateMember.memberId = this.requestContext.memberId; updateMember.memberId = this.requestContext.memberId;
updateMember.setWxOpenid(wxUser.getOpenid()); updateMember.wxOpenid = wxUser.openid;
this.memberMapper.updateById(updateMember); this.memberMapper.updateById(updateMember);
} catch (e) { } catch (e) {
throw new BadRequestException(e.message); throw new BadRequestException(e.message);
@@ -146,7 +146,7 @@ export class WeappServiceImplService {
.eq("is_weapp", 1) .eq("is_weapp", 1)
.eq("site_id", this.requestContext.siteId) .eq("site_id", this.requestContext.siteId)
.ne("weapp_template_id", "") .ne("weapp_template_id", "")
).stream().map(item => item.getWeappTemplateId()); ).stream().map(item => item.weappTemplateId);
} }
/** /**

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

@@ -17,7 +17,7 @@ export class ServeServiceImplService {
* service * service
*/ */
async service(request: HttpServletRequest, response: HttpServletResponse): Promise<any> { async service(request: HttpServletRequest, response: HttpServletResponse): Promise<any> {
response.setContentType("text/html;charset=utf-8"); response.contentType = "text/html;charset=utf-8";
response.status = HttpServletResponse.SC_OK; response.status = HttpServletResponse.SC_OK;
try { try {
@@ -28,14 +28,14 @@ export class ServeServiceImplService {
// 消息签名不正确，说明不是公众平台发过来的消息 // 消息签名不正确，说明不是公众平台发过来的消息
const wxMpService: WxMpService = WechatUtils.mp(this.requestContext.siteId); const wxMpService: WxMpService = WechatUtils.mp(this.requestContext.siteId);
if (!this.wxMpService.checkSignature(timestamp, nonce, signature)) { if (!this.wxMpService.checkSignature(timestamp, nonce, signature)) {
response.getWriter().println("非法请求"); response.writer.println("非法请求");
return; return;
} }
// 说明是一个仅仅用来验证的请求，回显echostr // 说明是一个仅仅用来验证的请求，回显echostr
const echostr: string = request.getParameter("echostr"); const echostr: string = request.getParameter("echostr");
if (StringUtils.isNotBlank(echostr)) { if (StringUtils.isNotBlank(echostr)) {
response.getWriter().println(echostr); response.writer.println(echostr);
return; return;
} }
@@ -45,22 +45,22 @@ export class ServeServiceImplService {
if ("raw".equals(encryptType)) { if ("raw".equals(encryptType)) {
// 明文传输的消息 // 明文传输的消息
inMessage = WxMpXmlMessage.fromXml(request.getInputStream()); inMessage = WxMpXmlMessage.fromXml(request.inputStream);
} else if ("aes".equals(encryptType)) { } else if ("aes".equals(encryptType)) {
// 是aes加密的消息 // 是aes加密的消息
const msgSignature: string = request.getParameter("msg_signature"); const msgSignature: string = request.getParameter("msg_signature");
inMessage = WxMpXmlMessage.fromEncryptedXml(request.getInputStream(), this.wxMpService.getWxMpConfigStorage(), timestamp, nonce, msgSignature); inMessage = WxMpXmlMessage.fromEncryptedXml(request.inputStream, this.wxMpService.wxMpConfigStorage, timestamp, nonce, msgSignature);
} else { } else {
response.getWriter().println("不可识别的加密类型"); response.writer.println("不可识别的加密类型");
return; return;
} }
const outMessage: WxMpXmlOutMessage = this.message(inMessage); const outMessage: WxMpXmlOutMessage = this.message(inMessage);
if (outMessage != null) { if (outMessage != null) {
if ("raw".equals(encryptType)) { if ("raw".equals(encryptType)) {
response.getWriter().write(outMessage.toXml()); response.writer.write(outMessage.toXml());
} else if ("aes".equals(encryptType)) { } else if ("aes".equals(encryptType)) {
response.getWriter().write(outMessage.toEncryptedXml(this.wxMpService.getWxMpConfigStorage())); response.writer.write(outMessage.toEncryptedXml(this.wxMpService.wxMpConfigStorage));
} }
return; return;
} }

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

@@ -37,15 +37,15 @@ export class WechatServiceImplService {
*/ */
async loginByCode(param: WechatAuthParam): Promise<any> { async loginByCode(param: WechatAuthParam): Promise<any> {
try { try {
const wxOAuth2AccessToken: WxOAuth2AccessToken = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getAccessToken(param.getCode()); const wxOAuth2AccessToken: WxOAuth2AccessToken = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getAccessToken(param.code);
const wxUser: WxOAuth2UserInfo = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null); const wxUser: WxOAuth2UserInfo = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null);
return this.login( return this.login(
ObjectUtil.defaultIfNull(wxUser.getOpenid(), ""), ObjectUtil.defaultIfNull(wxUser.openid, ""),
ObjectUtil.defaultIfNull(wxUser.getUnionId(), ""), ObjectUtil.defaultIfNull(wxUser.unionId, ""),
ObjectUtil.defaultIfNull(wxUser.getNickname(), ""), ObjectUtil.defaultIfNull(wxUser.nickname, ""),
ObjectUtil.defaultIfNull(wxUser.getHeadImgUrl(), ""), ObjectUtil.defaultIfNull(wxUser.headImgUrl, ""),
param.getPid() param.pid
); );
} catch (e) { } catch (e) {
throw new BadRequestException(e.message); throw new BadRequestException(e.message);
@@ -63,7 +63,7 @@ export class WechatServiceImplService {
data.getStr("unionid", ""), data.getStr("unionid", ""),
data.getStr("nickname", ""), data.getStr("nickname", ""),
data.getStr("avatar", ""), data.getStr("avatar", ""),
param.getPid() param.pid
); );
} }
@@ -71,27 +71,27 @@ export class WechatServiceImplService {
* register * register
*/ */
async register(param: AuthRegisterParam): Promise<any> { async register(param: AuthRegisterParam): Promise<any> {
if (param.getOpenid().isEmpty()) throw new BadRequestException("openid不能为空"); if (param.openid.isEmpty()) throw new BadRequestException("openid不能为空");
try { try {
const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId)); const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
if (ObjectUtil.isNotNull(member)) throw new BadRequestException("账号已存在"); if (ObjectUtil.isNotNull(member)) throw new BadRequestException("账号已存在");
if (!param.getUnionid().isEmpty()) { if (!param.unionid.isEmpty()) {
const unionidMember: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId)); const unionidMember: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
if (ObjectUtil.isNotNull(unionidMember)) throw new BadRequestException("账号已存在"); if (ObjectUtil.isNotNull(unionidMember)) throw new BadRequestException("账号已存在");
} }
const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId); const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId);
if (config.getIsBindMobile() == 1) { if (config.isBindMobile == 1) {
if (param.getMobile().isEmpty()) throw new BadRequestException("手机号不能为空"); if (param.mobile.isEmpty()) throw new BadRequestException("手机号不能为空");
this.registerService.checkMobileCode(param.getMobile(), param.getMobileKey(), param.getMobileCode()); this.registerService.checkMobileCode(param.mobile, param.mobileKey, param.mobileCode);
} }
const registerMember: Member = new Member(); const registerMember: Member = new Member();
registerMember.setWxOpenid(param.getOpenid()); registerMember.wxOpenid = param.openid;
registerMember.setMobile(param.getMobile()); registerMember.mobile = param.mobile;
registerMember.setWxUnionid(param.getUnionid()); registerMember.wxUnionid = param.unionid;
registerMember.setPid(param.getPid()); registerMember.pid = param.pid;
return this.registerService.register(registerMember); return this.registerService.register(registerMember);
} catch (e) { } catch (e) {
throw new BadRequestException(e.message); throw new BadRequestException(e.message);
@@ -103,13 +103,13 @@ export class WechatServiceImplService {
*/ */
async sync(param: WechatSyncParam): Promise<any> { async sync(param: WechatSyncParam): Promise<any> {
try { try {
const wxOAuth2AccessToken: WxOAuth2AccessToken = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getAccessToken(param.getCode()); const wxOAuth2AccessToken: WxOAuth2AccessToken = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getAccessToken(param.code);
const wxUser: WxOAuth2UserInfo = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null); const wxUser: WxOAuth2UserInfo = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null);
const member: Member = new Member(); const member: Member = new Member();
member.memberId = this.requestContext.memberId; member.memberId = this.requestContext.memberId;
member.setNickname(ObjectUtil.defaultIfNull(wxUser.getNickname(), "")); member.nickname = ObjectUtil.defaultIfNull(wxUser.nickname, "");
member.setHeadimg(ObjectUtil.defaultIfNull(wxUser.getHeadImgUrl(), "")); member.headimg = ObjectUtil.defaultIfNull(wxUser.headImgUrl, "");
this.memberMapper.updateById(member); this.memberMapper.updateById(member);
} catch (e) { } catch (e) {
throw new BadRequestException(e.message); throw new BadRequestException(e.message);
@@ -125,15 +125,15 @@ export class WechatServiceImplService {
const mp: WxMpService = WechatUtils.mp(this.requestContext.siteId); const mp: WxMpService = WechatUtils.mp(this.requestContext.siteId);
const wxOAuth2AccessToken: WxOAuth2AccessToken = mp.getOAuth2Service().getAccessToken(param.getCode()); const wxOAuth2AccessToken: WxOAuth2AccessToken = mp.oAuth2Service.getAccessToken(param.code);
if (wxOAuth2AccessToken.getScope() === "snsapi_base") { if (wxOAuth2AccessToken.scope === "snsapi_base") {
vo.setOpenid(ObjectUtil.defaultIfNull(wxOAuth2AccessToken.getOpenId(), "")); vo.openid = ObjectUtil.defaultIfNull(wxOAuth2AccessToken.openId, "");
} else { } else {
const userInfo: WxOAuth2UserInfo = mp.getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null); const userInfo: WxOAuth2UserInfo = mp.oAuth2Service.getUserInfo(wxOAuth2AccessToken, null);
vo.setOpenid(ObjectUtil.defaultIfNull(userInfo.getOpenid(), "")); vo.openid = ObjectUtil.defaultIfNull(userInfo.openid, "");
vo.setUnionid(ObjectUtil.defaultIfNull(userInfo.getUnionId(), "")); vo.unionid = ObjectUtil.defaultIfNull(userInfo.unionId, "");
vo.setNickname(ObjectUtil.defaultIfNull(userInfo.getNickname(), "")); vo.nickname = ObjectUtil.defaultIfNull(userInfo.nickname, "");
vo.setAvatar(ObjectUtil.defaultIfNull(userInfo.getHeadImgUrl(), "")); vo.avatar = ObjectUtil.defaultIfNull(userInfo.headImgUrl, "");
} }
return vo; return vo;
} catch (e) { } catch (e) {
@@ -148,7 +148,7 @@ export class WechatServiceImplService {
try { try {
const key: string = this.coreScanService.scan(this.requestContext.siteId, "wechat_login", new Record<string, any>().set("channel", RequestUtils.channel()), 300); const key: string = this.coreScanService.scan(this.requestContext.siteId, "wechat_login", new Record<string, any>().set("channel", RequestUtils.channel()), 300);
const ticket: WxMpQrCodeTicket = WechatUtils.mp(this.requestContext.siteId).getQrcodeService().qrCodeCreateTmpTicket(key, 300); const ticket: WxMpQrCodeTicket = WechatUtils.mp(this.requestContext.siteId).getQrcodeService().qrCodeCreateTmpTicket(key, 300);
const url: string = WechatUtils.mp(this.requestContext.siteId).getQrcodeService().qrCodePictureUrl(ticket.getTicket()); const url: string = WechatUtils.mp(this.requestContext.siteId).getQrcodeService().qrCodePictureUrl(ticket.ticket);
const vo: WechatScanLoginVo = new WechatScanLoginVo(); const vo: WechatScanLoginVo = new WechatScanLoginVo();
vo.key = key; vo.key = key;
@@ -165,7 +165,7 @@ export class WechatServiceImplService {
*/ */
async updateOpenid(param: WechatAuthParam): Promise<any> { async updateOpenid(param: WechatAuthParam): Promise<any> {
try { try {
const wxOAuth2AccessToken: WxOAuth2AccessToken = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getAccessToken(param.getCode()); const wxOAuth2AccessToken: WxOAuth2AccessToken = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getAccessToken(param.code);
const wxUser: WxOAuth2UserInfo = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null); const wxUser: WxOAuth2UserInfo = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null);
const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId)); const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
@@ -173,7 +173,7 @@ export class WechatServiceImplService {
const updateMember: Member = new Member(); const updateMember: Member = new Member();
updateMember.memberId = this.requestContext.memberId; updateMember.memberId = this.requestContext.memberId;
updateMember.setWxOpenid(wxUser.getOpenid()); updateMember.wxOpenid = wxUser.openid;
this.memberMapper.updateById(updateMember); this.memberMapper.updateById(updateMember);
} catch (e) { } catch (e) {
throw new BadRequestException(e.message); throw new BadRequestException(e.message);

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

@@ -77,7 +77,7 @@ export class CoreAddonInstallServiceImplService {
if (CommonUtils.isNotEmpty(addonObject)) { if (CommonUtils.isNotEmpty(addonObject)) {
throw new BadRequestException("当前插件已安装,不能重复安装"); throw new BadRequestException("当前插件已安装,不能重复安装");
} }
if (CommonUtils.isNotEmpty(this.getInstallTask())) { if (CommonUtils.isNotEmpty(this.installTask)) {
throw new BadRequestException("有正在安装中的插件"); throw new BadRequestException("有正在安装中的插件");
} }
this.installTask.put("mode", mode); this.installTask.put("mode", mode);
@@ -114,7 +114,7 @@ export class CoreAddonInstallServiceImplService {
* cancleInstall * cancleInstall
*/ */
async cancleInstall(): Promise<any> { async cancleInstall(): Promise<any> {
if (CommonUtils.isNotEmpty(this.getInstallTask())) this.installTask.clear(); if (CommonUtils.isNotEmpty(this.installTask)) this.installTask.clear();
this.installStep.clear(); this.installStep.clear();
} }
@@ -173,14 +173,14 @@ export class CoreAddonInstallServiceImplService {
this.installTask.put("addon", addon); this.installTask.put("addon", addon);
if (result) { if (result) {
this.installTask.put("status", "success"); this.installTask.put("status", "success");
const tips: string[] = AddonUpgradeHelper.getAddonInfo(); const tips: string[] = AddonUpgradeHelper.addonInfo;
this.installTask.put("tips", tips); this.installTask.put("tips", tips);
this.installCheck = false; this.installCheck = false;
log.warn("安装成功..........................................."); log.warn("安装成功...........................................");
} else { } else {
this.installTask.put("status", "fail"); this.installTask.put("status", "fail");
this.installTask.put("failReason", "jar包加载错误."); this.installTask.put("failReason", "jar包加载错误.");
const tips: string[] = AddonUpgradeHelper.getAddonInfo(); const tips: string[] = AddonUpgradeHelper.addonInfo;
this.installTask.put("tips", tips); this.installTask.put("tips", tips);
log.warn("执行回滚操作<---------------------begin--------------------->"); log.warn("执行回滚操作<---------------------begin--------------------->");
if (!this.appConfig.runActive.toLowerCase() === "dev".toLowerCase()) { if (!this.appConfig.runActive.toLowerCase() === "dev".toLowerCase()) {

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

@@ -62,7 +62,7 @@ export class CoreAddonServiceImplService {
addon.updateTime = Date.now( / 1000); addon.updateTime = Date.now( / 1000);
this.addonRepository.save(addon, /* TODO: any /* TODO: QueryWrapper<Addon> */需改写为TypeORM的where条件对象 */.eq("`key`", addon.key)); this.addonRepository.save(addon, /* TODO: any /* TODO: QueryWrapper<Addon> */需改写为TypeORM的where条件对象 */.eq("`key`", addon.key));
} else { } else {
addon.setInstallTime(Date.now() / 1000); addon.installTime = Date.now( / 1000);
this.addonRepository.save(addon); this.addonRepository.save(addon);
} }
} }

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

@@ -16,9 +16,9 @@ export class CoreAliappConfigServiceImplService {
async getAliappConfig(siteId: number): Promise<any> { async getAliappConfig(siteId: number): Promise<any> {
const coreSysConfigVo: CoreSysConfigVo = this.coreConfigService.getConfig(siteId, "aliapp"); const coreSysConfigVo: CoreSysConfigVo = this.coreConfigService.getConfig(siteId, "aliapp");
const vo: AliappConfigVo = new AliappConfigVo(); const vo: AliappConfigVo = new AliappConfigVo();
if(ObjectUtil.isNotNull(coreSysConfigVo.getValueJson())) if(ObjectUtil.isNotNull(coreSysConfigVo.valueJson))
{ {
vo = Object.assign(new AliappConfigVo(), coreSysConfigVo.getValueJson()) /* TODO: 检查AliappConfigVo构造函数 */; vo = Object.assign(new AliappConfigVo(), coreSysConfigVo.valueJson) /* TODO: 检查AliappConfigVo构造函数 */;
} }
return vo; return vo;
} }
@@ -28,6 +28,6 @@ export class CoreAliappConfigServiceImplService {
*/ */
async setAliappConfig(siteId: number, aliappConfigParam: AliappConfigParam): Promise<any> { async setAliappConfig(siteId: number, aliappConfigParam: AliappConfigParam): Promise<any> {
const json: Record<string, any> = JsonUtils.parseObject<any>(aliappConfigParam); const json: Record<string, any> = JsonUtils.parseObject<any>(aliappConfigParam);
this.coreConfigService.setConfig(siteId, "aliapp", json); this.coreConfigService.config = siteId, "aliapp", json;
} }
} }

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

@@ -15,8 +15,8 @@ export class CoreQueueServiceImplService {
* exec * exec
*/ */
async exec(taskArgument: TaskArgument): Promise<any> { async exec(taskArgument: TaskArgument): Promise<any> {
console.log("target bean => " + taskArgument.getTargetBean()); console.log("target bean => " + taskArgument.targetBean);
console.log("target method => " + taskArgument.getTargetMethod()); console.log("target method => " + taskArgument.targetMethod);
console.log("method argument => " + taskArgument); console.log("method argument => " + taskArgument);
console.log("execute time => " + Date.now()); console.log("execute time => " + Date.now());
try { try {

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

@@ -16,17 +16,17 @@ export class CoreCaptchaImgServiceImplService {
*/ */
async create(captchaType: string): Promise<any> { async create(captchaType: string): Promise<any> {
const captchaVO: CaptchaVO = new CaptchaVO(); const captchaVO: CaptchaVO = new CaptchaVO();
captchaVO.setCaptchaType(captchaType); captchaVO.captchaType = captchaType;
const responseModel: ResponseModel = this.captchaService.get(captchaVO); const responseModel: ResponseModel = this.captchaService.get(captchaVO);
const coreCaptchaInfoVo: CoreCaptchaInfoVo = new CoreCaptchaInfoVo(); const coreCaptchaInfoVo: CoreCaptchaInfoVo = new CoreCaptchaInfoVo();
if(responseModel.isSuccess()){ if(responseModel.isSuccess()){
const jsonObject: Record<string, any> = JsonUtils.parseObject<any>(responseModel.getRepData()); const jsonObject: Record<string, any> = JsonUtils.parseObject<any>(responseModel.repData);
coreCaptchaInfoVo.setToken(jsonObject.getStr("token")); coreCaptchaInfoVo.token = jsonObject.getStr("token");
coreCaptchaInfoVo.setJigsawImageBase64(jsonObject.getStr("jigsawImageBase64")); coreCaptchaInfoVo.jigsawImageBase64 = jsonObject.getStr("jigsawImageBase64");
coreCaptchaInfoVo.setOriginalImageBase64(jsonObject.getStr("originalImageBase64")); coreCaptchaInfoVo.originalImageBase64 = jsonObject.getStr("originalImageBase64");
coreCaptchaInfoVo.setSecretKey(jsonObject.getStr("secretKey")); coreCaptchaInfoVo.secretKey = jsonObject.getStr("secretKey");
}else{ }else{
throw new UnauthorizedException(responseModel.getRepMsg()); throw new UnauthorizedException(responseModel.repMsg);
} }
return coreCaptchaInfoVo; return coreCaptchaInfoVo;
} }
@@ -35,16 +35,16 @@ export class CoreCaptchaImgServiceImplService {
* check * check
*/ */
async check(coreCaptchaValiDateParam: CoreCaptchaValiDateParam): Promise<any> { async check(coreCaptchaValiDateParam: CoreCaptchaValiDateParam): Promise<any> {
if(ObjectUtil.isNull(coreCaptchaValiDateParam.getCaptchaType()) || ObjectUtil.isNull(coreCaptchaValiDateParam.getCaptchaCode()) || ObjectUtil.isNull(coreCaptchaValiDateParam.getCaptchaKey())){ if(ObjectUtil.isNull(coreCaptchaValiDateParam.captchaType) || ObjectUtil.isNull(coreCaptchaValiDateParam.captchaCode) || ObjectUtil.isNull(coreCaptchaValiDateParam.captchaKey)){
throw new UnauthorizedException("缺少参数"); throw new UnauthorizedException("缺少参数");
} }
const captchaVO: CaptchaVO = new CaptchaVO(); const captchaVO: CaptchaVO = new CaptchaVO();
captchaVO.setCaptchaType(coreCaptchaValiDateParam.getCaptchaType()); captchaVO.captchaType = coreCaptchaValiDateParam.captchaType;
captchaVO.setToken(coreCaptchaValiDateParam.getCaptchaKey()); captchaVO.token = coreCaptchaValiDateParam.captchaKey;
captchaVO.setPointJson(coreCaptchaValiDateParam.getCaptchaCode()); captchaVO.pointJson = coreCaptchaValiDateParam.captchaCode;
const responseModel: ResponseModel = this.captchaService.check(captchaVO); const responseModel: ResponseModel = this.captchaService.check(captchaVO);
if(!responseModel.isSuccess()){ if(!responseModel.isSuccess()){
throw new UnauthorizedException(responseModel.getRepMsg()); throw new UnauthorizedException(responseModel.repMsg);
} }
return true; return true;
} }
@@ -55,7 +55,7 @@ export class CoreCaptchaImgServiceImplService {
async verification(captchaVO: CaptchaVO): Promise<any> { async verification(captchaVO: CaptchaVO): Promise<any> {
const responseModel: ResponseModel = this.captchaService.verification(captchaVO); const responseModel: ResponseModel = this.captchaService.verification(captchaVO);
if(!responseModel.isSuccess()){ if(!responseModel.isSuccess()){
throw new UnauthorizedException(responseModel.getRepMsg()); throw new UnauthorizedException(responseModel.repMsg);
} }
} }
} }

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

@@ -47,7 +47,7 @@ export class DefaultCaptchaServiceImplService {
if (captchaVO == null) { if (captchaVO == null) {
return RepCodeEnum.NULL_ERROR.parseError("captchaVO"); return RepCodeEnum.NULL_ERROR.parseError("captchaVO");
} else { } else {
return StringUtils.isEmpty(captchaVO.getCaptchaType()) ? RepCodeEnum.NULL_ERROR.parseError("类型") : this.getService(captchaVO.getCaptchaType()).get(captchaVO); return StringUtils.isEmpty(captchaVO.captchaType) ? RepCodeEnum.NULL_ERROR.parseError("类型") : this.getService(captchaVO.captchaType).get(captchaVO);
} }
} }
@@ -57,10 +57,10 @@ export class DefaultCaptchaServiceImplService {
async check(captchaVO: CaptchaVO): Promise<any> { async check(captchaVO: CaptchaVO): Promise<any> {
if (captchaVO == null) { if (captchaVO == null) {
return RepCodeEnum.NULL_ERROR.parseError("captchaVO"); return RepCodeEnum.NULL_ERROR.parseError("captchaVO");
} else if (StringUtils.isEmpty(captchaVO.getCaptchaType())) { } else if (StringUtils.isEmpty(captchaVO.captchaType)) {
return RepCodeEnum.NULL_ERROR.parseError("类型"); return RepCodeEnum.NULL_ERROR.parseError("类型");
} else { } else {
return StringUtils.isEmpty(captchaVO.getToken()) ? RepCodeEnum.NULL_ERROR.parseError("token") : this.getService(captchaVO.getCaptchaType()).check(captchaVO); return StringUtils.isEmpty(captchaVO.token) ? RepCodeEnum.NULL_ERROR.parseError("token") : this.getService(captchaVO.captchaType).check(captchaVO);
} }
} }
@@ -70,11 +70,11 @@ export class DefaultCaptchaServiceImplService {
async verification(captchaVO: CaptchaVO): Promise<any> { async verification(captchaVO: CaptchaVO): Promise<any> {
if (captchaVO == null) { if (captchaVO == null) {
return RepCodeEnum.NULL_ERROR.parseError("captchaVO"); return RepCodeEnum.NULL_ERROR.parseError("captchaVO");
} else if (StringUtils.isEmpty(captchaVO.getCaptchaVerification())) { } else if (StringUtils.isEmpty(captchaVO.captchaVerification)) {
return RepCodeEnum.NULL_ERROR.parseError("二次校验参数"); return RepCodeEnum.NULL_ERROR.parseError("二次校验参数");
} else { } else {
try { try {
const codeKey: string = String.format(REDIS_SECOND_CAPTCHA_KEY, captchaVO.getCaptchaVerification()); const codeKey: string = String.format(REDIS_SECOND_CAPTCHA_KEY, captchaVO.captchaVerification);
if (!CaptchaServiceFactory.getCache(cacheType).exists(codeKey)) { if (!CaptchaServiceFactory.getCache(cacheType).exists(codeKey)) {
return ResponseModel.errorMsg(RepCodeEnum.API_CAPTCHA_INVALID); return ResponseModel.errorMsg(RepCodeEnum.API_CAPTCHA_INVALID);
} }

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

@@ -22,9 +22,9 @@ export class CoreAppCloudServiceImplService {
const appConfig: AppConfigVo = this.coreAppService.getConfig(param.siteId); const appConfig: AppConfigVo = this.coreAppService.getConfig(param.siteId);
if (CommonUtils.isEmpty(appConfig.appName)) throw new BadRequestException("请先配置应用名称"); if (CommonUtils.isEmpty(appConfig.appName)) throw new BadRequestException("请先配置应用名称");
if (CommonUtils.isEmpty(appConfig.getUniAppId())) throw new BadRequestException("请先配置应用ID"); if (CommonUtils.isEmpty(appConfig.uniAppId)) throw new BadRequestException("请先配置应用ID");
if (CommonUtils.isEmpty(appConfig.getAndroidAppKey())) throw new BadRequestException("请先配置应用密钥"); if (CommonUtils.isEmpty(appConfig.androidAppKey)) throw new BadRequestException("请先配置应用密钥");
if (CommonUtils.isEmpty(appConfig.getApplicationId())) throw new BadRequestException("请先配置应用包名"); if (CommonUtils.isEmpty(appConfig.applicationId)) throw new BadRequestException("请先配置应用包名");
const taskKey: string = String(Date.now() / 1000); const taskKey: string = String(Date.now() / 1000);
@@ -40,29 +40,29 @@ export class CoreAppCloudServiceImplService {
const build: Record<string, any> = new Record<string, any>(); const build: Record<string, any> = new Record<string, any>();
build.set("app_name", appConfig.appName); build.set("app_name", appConfig.appName);
build.set("uni_app_id", appConfig.getUniAppId()); build.set("uni_app_id", appConfig.uniAppId);
build.set("wechat_app_id", ObjectUtil.defaultIfNull(appConfig.getWechatAppId(), "")); build.set("wechat_app_id", ObjectUtil.defaultIfNull(appConfig.wechatAppId, ""));
build.set("wechat_app_secret", ObjectUtil.defaultIfNull(appConfig.getWechatAppSecret(), "")); build.set("wechat_app_secret", ObjectUtil.defaultIfNull(appConfig.wechatAppSecret, ""));
build.set("android_app_key", appConfig.getAndroidAppKey()); build.set("android_app_key", appConfig.androidAppKey);
build.set("application_id", appConfig.getApplicationId()); build.set("application_id", appConfig.applicationId);
build.set("privacy_agreement", wapUrl + "/app/pages/auth/agreement?key=privacy&="); build.set("privacy_agreement", wapUrl + "/app/pages/auth/agreement?key=privacy&=");
build.set("service_agreement", wapUrl + "/app/pages/auth/agreement?key=service&="); build.set("service_agreement", wapUrl + "/app/pages/auth/agreement?key=service&=");
build.set("qq_map_key", mapConfig.key); build.set("qq_map_key", mapConfig.key);
build.set("amap_key", ""); build.set("amap_key", "");
build.set("version_name", param.getVersionName()); build.set("version_name", param.versionName);
build.set("version_code", param.getVersionCode()); build.set("version_code", param.versionCode);
build.putByPath("cert.type", param.getCert().getType()); build.putByPath("cert.type", param.cert.getType());
build.putByPath("cert.file", param.getCert().getFile()); build.putByPath("cert.file", param.cert.getFile());
build.putByPath("cert.key_alias", param.getCert().getKeyAlias()); build.putByPath("cert.key_alias", param.cert.getKeyAlias());
build.putByPath("cert.key_password", param.getCert().getKeyPassword()); build.putByPath("cert.key_password", param.cert.getKeyPassword());
build.putByPath("cert.store_password", param.getCert().getStorePassword()); build.putByPath("cert.store_password", param.cert.getStorePassword());
try { try {
// 写入build.json文件 // 写入build.json文件
fs.writeFileSync(packageDir, "build.json", build.toString(), "UTF-8"); fs.writeFileSync(packageDir, "build.json", build.toString(), "UTF-8");
// 拷贝证书文件 // 拷贝证书文件
if (param.getCert().getType() === "private"){ if (param.cert.getType() === "private"){
const certFile: string = this.appConfig.webRootDownResource, param.getCert(.getFile()); const certFile: string = this.appConfig.webRootDownResource, param.getCert(.getFile());
if (!fs.existsSync(certFile)) throw new BadRequestException("证书文件不存在"); if (!fs.existsSync(certFile)) throw new BadRequestException("证书文件不存在");
@@ -77,14 +77,14 @@ export class CoreAppCloudServiceImplService {
// 将临时目录下文件生成压缩包 // 将临时目录下文件生成压缩包
const zipFile: string = ZipUtil.zip(packageDir, tempDir + "app.zip"); const zipFile: string = ZipUtil.zip(packageDir, tempDir + "app.zip");
const instance: NiucloudUtils = NiucloudUtils.getInstance(); const instance: NiucloudUtils = NiucloudUtils.instance;
const actionQuery: Record<String, Object> = new const query: Record<>(); const actionQuery: Record<String, Object> = new const query: Record<>();
actionQuery.put("data[product_key]", instance.getProductKey()); actionQuery.put("data[product_key]", instance.productKey);
const actionToken: Record<string, any> = this.niucloudService.getActionToken("appbuild", actionQuery); const actionToken: Record<string, any> = this.niucloudService.getActionToken("appbuild", actionQuery);
Record<String, Object> = {}; Record<String, Object> = {};
query.put("authorize_code", instance.getCode()); query.put("authorize_code", instance.code);
query.put("timestamp", taskKey); query.put("timestamp", taskKey);
query.put("token", actionToken == null ? "" : actionToken.getStr("token")); query.put("token", actionToken == null ? "" : actionToken.getStr("token"));
@@ -108,17 +108,17 @@ export class CoreAppCloudServiceImplService {
* getAppCompileLog * getAppCompileLog
*/ */
async getAppCompileLog(key: string): Promise<any> { async getAppCompileLog(key: string): Promise<any> {
const instance: NiucloudUtils = NiucloudUtils.getInstance(); const instance: NiucloudUtils = NiucloudUtils.instance;
const query: Record<String, Object> = {}; const query: Record<String, Object> = {};
query.put("authorize_code", instance.getCode()); query.put("authorize_code", instance.code);
query.put("timestamp", key); query.put("timestamp", key);
const response: HttpResponse = new NiucloudUtils.Cloud().build("cloud/get_appbuild_logs").query(query).method(Method.GET).execute(); const response: HttpResponse = new NiucloudUtils.Cloud().build("cloud/get_appbuild_logs").query(query).method(Method.GET).execute();
try { try {
const vo: AppCompileLogVo = new AppCompileLogVo(); const vo: AppCompileLogVo = new AppCompileLogVo();
const log: Record<string, any> = JsonUtils.parseObject<any>(response.body()); const log: Record<string, any> = JsonUtils.parseObject<any>(response.body());
vo.setBuildLog(log); vo.buildLog = log;
if (log != null) { if (log != null) {
const data: JSONArray = ObjectUtil.defaultIfNull(log.getByPath("data.0", JSONArray.class), new JSONArray()); const data: JSONArray = ObjectUtil.defaultIfNull(log.getByPath("data.0", JSONArray.class), new JSONArray());
@@ -126,7 +126,7 @@ export class CoreAppCloudServiceImplService {
const last: Record<string, any> = data.getRecord<string, any>(data.length - 1); const last: Record<string, any> = data.getRecord<string, any>(data.length - 1);
if (last.getInt("code", -1).equals(0)) { if (last.getInt("code", -1).equals(0)) {
vo.status = "fail"; vo.status = "fail";
vo.setFailReason(last.getStr("msg", "")); vo.failReason = last.getStr("msg", "");
return vo; return vo;
} }
if (last.getInt("percent", 0).equals(100)) { if (last.getInt("percent", 0).equals(100)) {
@@ -146,11 +146,11 @@ export class CoreAppCloudServiceImplService {
*/ */
async generateSignCert(param: GenerateSignCertParam): Promise<any> { async generateSignCert(param: GenerateSignCertParam): Promise<any> {
const query: Record<String, Object> = {}; const query: Record<String, Object> = {};
query.put("key_alias", param.getKeyAlias()); query.put("key_alias", param.keyAlias);
query.put("key_password", param.getKeyPassword()); query.put("key_password", param.keyPassword);
query.put("store_password", param.getStorePassword()); query.put("store_password", param.storePassword);
query.put("limit", param.limit); query.put("limit", param.limit);
query.put("dname", "CN=" + param.getCn() + ", OU=" + param.getOu() + ", O=" + param.getO() + ", L=" + param.getL() + ", ST=" + param.getSt() + ", C=" + param.getC()); query.put("dname", "CN=" + param.cn + ", OU=" + param.ou + ", O=" + param.o + ", L=" + param.l + ", ST=" + param.st + ", C=" + param.c);
const response: HttpResponse = new NiucloudUtils.Cloud().build("cloud/getcert").query(query).method(Method.GET).execute(); const response: HttpResponse = new NiucloudUtils.Cloud().build("cloud/getcert").query(query).method(Method.GET).execute();
@@ -168,7 +168,7 @@ export class CoreAppCloudServiceImplService {
const file: string = tempDir + param.getKeyAlias( + ".zip"); const file: string = tempDir + param.getKeyAlias( + ".zip");
const fos: FileOutputStream = new FileOutputStream(file, true); const fos: FileOutputStream = new FileOutputStream(file, true);
fos.write(response.bodyBytes()); fos.write(response.bodyBytes());
return "upload/download/cert/" + param.getKeyAlias() + ".zip"; return "upload/download/cert/" + param.keyAlias + ".zip";
} catch (e) { } catch (e) {
console.error(e); console.error(e);
throw new BadRequestException(e.message); throw new BadRequestException(e.message);

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

@@ -16,16 +16,16 @@ export class CoreAppServiceImplService {
*/ */
async getConfig(siteId: number): Promise<any> { async getConfig(siteId: number): Promise<any> {
const config: CoreSysConfigVo = this.coreConfigService.getConfig(siteId, ConfigKeyEnum.path.basename(APP)); const config: CoreSysConfigVo = this.coreConfigService.getConfig(siteId, ConfigKeyEnum.path.basename(APP));
if (config == null || config.getValueJson() == null) { if (config == null || config.valueJson == null) {
return new AppConfigVo(); return new AppConfigVo();
} }
return Object.assign(new AppConfigVo(), config.getValueJson()) /* TODO: 检查AppConfigVo构造函数 */; return Object.assign(new AppConfigVo(), config.valueJson) /* TODO: 检查AppConfigVo构造函数 */;
} }
/** /**
* setConfig * setConfig
*/ */
async setConfig(siteId: number, param: SetAppParam): Promise<any> { async setConfig(siteId: number, param: SetAppParam): Promise<any> {
this.coreConfigService.setConfig(siteId, ConfigKeyEnum.path.basename(APP), JsonUtils.parseObject<any>(param)); this.coreConfigService.config = siteId, ConfigKeyEnum.path.basename(APP, JsonUtils.parseObject<any>(param));
} }
} }

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