From b6dd47b05107fc36d8ff4f7f29a4446521f95503 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期四, 02 一月 2025 18:44:28 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/DingTalkController.java | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/DingTalkController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/DingTalkController.java index a9d40b8..9d867f9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/DingTalkController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/DingTalkController.java @@ -1,5 +1,7 @@ package com.ruoyi.web.controller.project; +import com.aliyun.dingtalkoauth2_1_0.models.GetSsoUserInfoResponseBody; +import com.aliyun.tea.Validation; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.project.domain.vo.DingTalkReqVo; @@ -7,13 +9,11 @@ import com.taobao.api.ApiException; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.PropertySource; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * 閽夐拤鎺ュ彛 @@ -21,9 +21,10 @@ * @author liusheng * @date 2023-05-15 */ +@Slf4j @Api(description = "閽夐拤鎺ュ彛") @RestController -@RequestMapping("/smartor/dingtalk") +@RequestMapping("/system/dingtalk") @PropertySource(value = {"classpath:application-druid.yml"}) public class DingTalkController extends BaseController { @@ -45,6 +46,7 @@ @ApiOperation("鍙戦�侀拤閽夋秷鎭�") @PostMapping("/sendNotification") public AjaxResult sendNotification(@RequestBody DingTalkReqVo dingTalkReqVo) { + log.info("鍙戦�侀拤閽夋秷鎭細{}", dingTalkReqVo); Boolean aBoolean = dingTalkService.sendNotification(dingTalkReqVo); if (aBoolean) { return success(); @@ -52,5 +54,18 @@ return error(); } + /** + * 缁欓儴闂ㄤ笅鐨勭敤鎴蜂俊鎭祴dingUserId,骞惰褰曞埌sys_user琛ㄤ腑 + * + * @param deptID + * @return + */ + @ApiOperation("缁欓儴闂ㄤ笅鐨勭敤鎴蜂俊鎭祴dingUserId") + @GetMapping("/deptidList/{deptID}") + public AjaxResult deptidList(@PathVariable("deptID") Long deptID) { + dingTalkService.deptidList(deptID, 1); + return success(); + } + } -- Gitblit v1.9.3