发布

tz-module-system/tz-module-system-api/src/main/java/cn/start/tz/module/system/api/standard/StandardTemplateApi.java

@@ -11,6 +11,9 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.Collection;
+import java.util.List;
+
 @FeignClient(name = ApiConstants.NAME)
 @Tag(name = "RPC 服务 - 标准模版")
 public interface StandardTemplateApi {
@@ -28,4 +31,8 @@ public interface StandardTemplateApi {
     CommonResult<StandardTemplateRespDTO> getClassTemplate(@RequestParam("classId") String classId,
                                                            @RequestParam("templateType") String templateType);
 
+    @GetMapping(PREFIX + "/list")
+    @Operation(summary = "获得标准模版信息列表")
+    @Parameter(name = "ids", description = "标准模版编号列表", example = "1024", required = true)
+    CommonResult<List<StandardTemplateRespDTO>> getStandardTemplateList(@RequestParam("ids") Collection<String> ids);
 }

tz-module-system/tz-module-system-biz/src/main/java/cn/start/tz/module/system/api/standard/StandardTemplateApiImpl.java

@@ -18,6 +18,7 @@ import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Collection;
 import java.util.List;
 
 import static cn.start.tz.framework.common.pojo.CommonResult.success;
@@ -55,4 +56,10 @@ public class StandardTemplateApiImpl implements StandardTemplateApi {
         }
         return new CommonResult<>();
     }
+
+    @Override
+    public CommonResult<List<StandardTemplateRespDTO>> getStandardTemplateList(Collection<String> ids) {
+        List<StandardTemplateDO> templateDOList = standardTemplateService.listByIds(ids);
+        return success(BeanUtils.toBean(templateDOList, StandardTemplateRespDTO.class));
+    }
 }

tz-module-system/tz-module-system-biz/src/main/java/cn/start/tz/module/system/controller/appapi/auth/AuthAppApiController.java

@@ -7,17 +7,23 @@ import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.framework.security.config.SecurityProperties;
 import cn.start.tz.framework.security.core.util.SecurityFrameworkUtils;
 import cn.start.tz.module.system.controller.admin.auth.vo.*;
+import cn.start.tz.module.system.controller.admin.user.vo.user.UserRespVO;
+import cn.start.tz.module.system.controller.admin.userqualifications.vo.UserQualificationsSaveReqVO;
 import cn.start.tz.module.system.convert.auth.AuthConvert;
+import cn.start.tz.module.system.convert.user.UserConvert;
+import cn.start.tz.module.system.dal.dataobject.dept.DeptDO;
 import cn.start.tz.module.system.dal.dataobject.permission.MenuDO;
 import cn.start.tz.module.system.dal.dataobject.permission.RoleDO;
 import cn.start.tz.module.system.dal.dataobject.user.AdminUserDO;
 import cn.start.tz.module.system.enums.logger.LoginLogTypeEnum;
 import cn.start.tz.module.system.service.auth.AdminAuthService;
+import cn.start.tz.module.system.service.dept.DeptService;
 import cn.start.tz.module.system.service.permission.MenuService;
 import cn.start.tz.module.system.service.permission.PermissionService;
 import cn.start.tz.module.system.service.permission.RoleService;
 import cn.start.tz.module.system.service.social.SocialClientService;
 import cn.start.tz.module.system.service.user.AdminUserService;
+import cn.start.tz.module.system.service.userqualifications.UserQualificationsService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -26,6 +32,7 @@ import jakarta.annotation.security.PermitAll;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -60,6 +67,12 @@ public class AuthAppApiController {
     @Resource
     private SecurityProperties securityProperties;
 
+    @Resource
+    private DeptService deptService;
+
+    @Resource
+    private UserQualificationsService userQualificationsService;
+
     @PostMapping("/login")
     @PermitAll
     @Operation(summary = "使用账号密码登录")
@@ -114,6 +127,24 @@ public class AuthAppApiController {
     }
 
 
-
+    @GetMapping("/userinfo")
+    @Operation(summary = "获得用户详情")
+    public CommonResult<UserRespVO> getUser() {
+        String userId = getLoginUserId();
+        AdminUserDO user = userService.getUser(userId);
+        if (user == null) {
+            return success(null);
+        }
+        // 拼接数据
+        DeptDO dept = deptService.getDept(user.getDeptId());
+        DeptDO secondDept = deptService.getDept(user.getSecondDept());
+        UserRespVO convert = UserConvert.INSTANCE.convert(user, dept);
+        List<UserQualificationsSaveReqVO> userQualificationsSaveReqVOS = userQualificationsService.getUserQualificationByUserId(userId);
+        convert.setUserQualificationsSaveReqVOS(userQualificationsSaveReqVOS);
+        if (secondDept != null) {
+            convert.setSecondDeptName(secondDept.getName());
+        }
+        return success(convert);
+    }
 
 }