From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java | 145 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 139 insertions(+), 6 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 2e36008..805eed6 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
@@ -1,15 +1,19 @@
package com.ruoyi.system.controller.conslole;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.constant.ConfigEnum;
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.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.service.config.ActivenessService;
-import com.ruoyi.system.service.config.SysClassificationService;
-import com.ruoyi.system.service.config.SysTagService;
+import com.ruoyi.system.domain.dto.MgtCustomConfigDto;
+import com.ruoyi.system.domain.pojo.config.CustomConfig;
+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;
@@ -43,6 +47,17 @@
@Resource
private ISysUserService sysUserService;
+ @Resource
+ private DelayTaskService delayTaskService;
+
+ @Resource
+ private CustomConfigService customConfigService;
+
+ @Resource
+ private SysStaffService sysStaffService;
+
+ @Resource
+ private FileRecordService fileRecordService;
/**
@@ -144,5 +159,123 @@
return R.ok(activeness);
}
+ @PostMapping("/getDelayTask")
+ public R<DelayTask> getDelayTask(@RequestBody String key)
+ {
+ DelayTask delayTask = delayTaskService.getDelayTask(key);
+ return R.ok(delayTask);
+ }
+ @PostMapping("/addDelayTask")
+ public R addDelayTask(@RequestBody DelayTask delayTask)
+ {
+ delayTaskService.addDelayTask(delayTask);
+ return R.ok();
+ }
+
+ @PostMapping("/deleteDelayTask")
+ public R deleteDelayTask(@RequestBody String key)
+ {
+ delayTaskService.deleteDelayTask(key);
+ return R.ok();
+ }
+
+ /**
+ * @description 获取其他设置
+ * @author jqs
+ * @date 2023/7/12 15:27
+ * @param
+ * @return R<AppOtherConfigGetVo>
+ */
+ @PostMapping("/getAppOtherConfigGetVo")
+ public R<AppOtherConfigGetVo> getAppOtherConfigGetVo()
+ {
+ AppOtherConfigGetVo appOtherConfigGetVo = customConfigService.getAppOtherConfigGetVo();
+ return R.ok(appOtherConfigGetVo);
+ }
+
+ /**
+ * @description 改变分类数量
+ * @author jqs
+ * @date 2023/7/20 20:06
+ * @param mgtClassNumDto
+ * @return R
+ */
+ @PostMapping("/changeClassNum")
+ public R changeClassNum(@RequestBody MgtClassNumDto mgtClassNumDto)
+ {
+ 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();
+ }
+
+
+ /**
+ * 获取门店课程验证密码
+ * @return
+ */
+ @PostMapping("/getStoreCurriculumPassword")
+ public R<String> getStoreCurriculumPassword(){
+ CustomConfig one = customConfigService.getOne(new QueryWrapper<CustomConfig>().eq("config_type", ConfigEnum.STORE_COURSE_DISPLAY_PASSWORD.getKeyType())
+ .eq("config_key", ConfigEnum.STORE_COURSE_DISPLAY_PASSWORD.getKey()));
+ return R.ok(one.getConfigValue());
+ }
+
+
+ /**
+ * 获取门店课程展示名称
+ * @return
+ */
+ @PostMapping("/getStoreCurriculumName")
+ public R<String> getStoreCurriculumName(){
+ CustomConfig one = customConfigService.getOne(new QueryWrapper<CustomConfig>().eq("config_type", ConfigEnum.STORE_COURSE_DISPLAY_NAME.getKeyType())
+ .eq("config_key", ConfigEnum.STORE_COURSE_DISPLAY_NAME.getKey()));
+ return R.ok(one.getConfigValue());
+ }
}
--
Gitblit v1.7.1