diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java index 99b48750..5dccfdbc 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java @@ -26,7 +26,6 @@ import com.pig4cloud.plugin.excel.annotation.Sheet; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import org.springframework.beans.BeanUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -73,18 +72,6 @@ public class UserController { return R.ok(userService.getCurrentUserInfo()); } - @GetMapping("/getUserTypeList") - public R getUserTypeList() { - List> result = CollectionUtil.newArrayList(); - for (UserTypeEnum userTypeEnum : UserTypeEnum.values()) { - Map select = MapUtil.newHashMap(); - select.put("value", userTypeEnum.getValue()); - select.put("label", userTypeEnum.getDescription()); - result.add(select); - } - return R.ok(result); - } - @GetMapping("/{id:\\w+}") public R getById(@PathVariable("id") String id) { KiccUser user = userService.getUserById(id); diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeCustomObjController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeCustomObjController.java index c33e57da..f672a2bc 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeCustomObjController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeCustomObjController.java @@ -1,8 +1,10 @@ package com.cloud.kicc.system.devtools.controller; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; @@ -56,6 +58,12 @@ public class GencodeCustomObjController { return R.ok(); } + @GetMapping("/getByValue") + public R getByValue(String value) { + GencodeCustomObj gencodeCustomObj = iGencodeCustomObjService.getOne(Wrappers.lambdaQuery().eq(GencodeCustomObj::getValue, value)); + return R.ok(gencodeCustomObj); + } + @DeleteMapping("/remove/{id:[\\w,]+}") public R remove(@PathVariable String[] id) { iGencodeCustomObjService.removeByIds(Arrays.asList(id)); diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AppService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AppService.java index fa3878a9..c9f8f414 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AppService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AppService.java @@ -21,7 +21,7 @@ public interface AppService { R sendSmsCode(String mobile); /** - * 手机号一键注册 + * 安卓APP端手机号一键注册 * @param phone 手机号 * @param captcha 验证码 */ diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AppServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AppServiceImpl.java index e743a000..7eb101e3 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AppServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AppServiceImpl.java @@ -11,6 +11,7 @@ import com.cloud.kicc.common.core.constant.CacheConstants; import com.cloud.kicc.common.core.constant.SecurityConstants; import com.cloud.kicc.common.core.exception.CheckedException; import com.cloud.kicc.common.core.exception.ValidateCodeException; +import com.cloud.kicc.common.data.entity.KiccUser; import com.cloud.kicc.common.data.entity.SsoUser; import com.cloud.kicc.system.api.entity.Dept; import com.cloud.kicc.system.api.entity.User; @@ -86,11 +87,15 @@ public class AppServiceImpl implements AppService { String initDeptId = configService.getValueByKey("app.init.deptId"); Dept dept = deptService.getById(initDeptId); Optional.ofNullable(dept).orElseThrow(() -> new CheckedException("当前部门无效请重新在参数管理中配置!")); + String execAdminUserId = configService.getValueByKey("app.exec.admin.userId"); + KiccUser kiccUser = userService.getUserById(execAdminUserId); + Optional.ofNullable(kiccUser).orElseThrow(() -> new CheckedException("当前系统管理执行用户无效请重新在参数管理中配置!")); String initUserType = configService.getValueByKey("app.init.deptId"); String initTenantId = configService.getValueByKey("app.init.tenantId"); String initRoleIds = configService.getValueByKey("app.init.roleIds"); String initPassword = configService.getValueByKey("appid.password"); + // 用户已注册直接返回进行登陆 List findSsoUser = iSsoUserService.list(Wrappers.lambdaQuery() .eq(SsoUser::getPhone, phone) .eq(SsoUser::getTenantId, initTenantId) @@ -107,6 +112,8 @@ public class AppServiceImpl implements AppService { ssoUser.setPhone(phone); ssoUser.setIdentityProvider(identityProvider); ssoUser.setTenantId(initTenantId); + ssoUser.setCreateById(kiccUser.getUsername()); + ssoUser.setCreateByName(kiccUser.getId()); iSsoUserService.save(ssoUser); User user = new User(); @@ -115,6 +122,8 @@ public class AppServiceImpl implements AppService { user.setDeptName(dept.getName()); user.setUserType(initUserType); user.setTenantId(initTenantId); + user.setCreateById(kiccUser.getUsername()); + user.setCreateByName(kiccUser.getId()); userService.save(user); // 处理角色授权