From 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java
index d367213..7afe3fc 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java
@@ -4,13 +4,13 @@
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.domain.dto.MgtCustomConfigDto;
import com.ruoyi.system.service.config.*;
+import com.ruoyi.system.service.staff.SysStaffService;
import com.ruoyi.system.service.sys.ISysUserService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -49,6 +49,12 @@
@Resource
private CustomConfigService customConfigService;
+
+ @Resource
+ private SysStaffService sysStaffService;
+
+ @Resource
+ private FileRecordService fileRecordService;
/**
@@ -198,4 +204,51 @@
sysClassificationService.changeClassNum(mgtClassNumDto);
return R.ok();
}
+
+ /**
+ * @description 获取客户电话
+ * @author jqs
+ * @date 2023/7/29 15:26
+ * @return R<String>
+ */
+ @PostMapping("/getServicePhone")
+ public R<String> getServicePhone()
+ {
+ MgtCustomConfigDto mgtCustomConfigDto = new MgtCustomConfigDto();
+ mgtCustomConfigDto.setConfigType("PLATFORM_SERVICE_PHONE");
+ List<String> mgtCustomConfigVo = customConfigService.getCustomConfig(mgtCustomConfigDto);
+ String servicePhone = "暂无客服电话";
+ if(mgtCustomConfigVo!=null&&mgtCustomConfigVo.size()>0){
+ servicePhone = mgtCustomConfigVo.get(0);
+ }
+ return R.ok(servicePhone);
+ }
+
+ /**
+ * @description 通过id获取员工列表
+ * @author jqs
+ * @date 2023/9/5 10:01
+ * @param userIdList
+ * @return R<List<SysStaff>>
+ */
+ @PostMapping("/listSysStaffByIds")
+ public R<List<SysStaff>> listSysStaffByIds(@RequestBody List<Long> userIdList)
+ {
+ List<SysStaff> sysStaffList = sysStaffService.listSysStaffByIds(userIdList);
+ return R.ok(sysStaffList);
+ }
+
+ /**
+ * @description 创建文件上传记录
+ * @author jqs
+ * @date 2023/9/11 11:56
+ * @param fileRecord
+ * @return R
+ */
+ @PostMapping("/createFileRecord")
+ public R createFileRecord(@RequestBody FileRecord fileRecord)
+ {
+ fileRecordService.createFileRecord(fileRecord);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1