From aa6ffcaae173e0ba6372c90261b8a7d4b1fd6052 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期五, 26 一月 2024 11:07:17 +0800 Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 1.1 --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteConfigService.java | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteConfigService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteConfigService.java index fb8ec82..15b925d 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteConfigService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteConfigService.java @@ -5,10 +5,8 @@ import com.ruoyi.system.api.domain.dto.MgtBaseBathDto; import com.ruoyi.system.api.domain.dto.MgtClassNumDto; import com.ruoyi.system.api.domain.dto.MgtUserIdByDept; -import com.ruoyi.system.api.domain.poji.config.Activeness; -import com.ruoyi.system.api.domain.poji.config.DelayTask; -import com.ruoyi.system.api.domain.poji.config.SysClassification; -import com.ruoyi.system.api.domain.poji.config.SysTag; +import com.ruoyi.system.api.domain.poji.config.*; +import com.ruoyi.system.api.domain.poji.sys.SysStaff; import com.ruoyi.system.api.domain.vo.AppOtherConfigGetVo; import com.ruoyi.system.api.domain.vo.MgtSysSimpleUserVo; import com.ruoyi.system.api.factory.RemoteConfigFallbackFactory; @@ -127,4 +125,34 @@ */ @PostMapping("/config/changeClassNum") public R changeClassNum(@RequestBody MgtClassNumDto mgtClassNumDto); + + /** + * @description 获取客服电话 + * @author jqs + * @date 2023/7/29 16:11 + * @param + * @return R<String> + */ + @PostMapping("/config/getServicePhone") + public R<String> getServicePhone(); + + /** + * @description 通过id获取员工列表 + * @author jqs + * @date 2023/9/5 10:01 + * @param userIdList + * @return R<List<SysStaff>> + */ + @PostMapping("/config/listSysStaffByIds") + public R<List<SysStaff>> listSysStaffByIds(@RequestBody List<Long> userIdList); + + /** + * @description 创建文件上传记录 + * @author jqs + * @date 2023/9/11 11:56 + * @param fileRecord + * @return R + */ + @PostMapping("/config/createFileRecord") + public R createFileRecord(@RequestBody FileRecord fileRecord); } -- Gitblit v1.7.1