From 2f38b2341e1572502fd6b4510670107f57ed261c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期五, 18 八月 2023 23:05:34 +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 | 94 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 91 insertions(+), 3 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 91e2db7..e50951a 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
@@ -2,14 +2,16 @@
import com.ruoyi.common.core.domain.R;
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.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.service.config.*;
import com.ruoyi.system.service.sys.ISysUserService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -43,6 +45,11 @@
@Resource
private ISysUserService sysUserService;
+ @Resource
+ private DelayTaskService delayTaskService;
+
+ @Resource
+ private CustomConfigService customConfigService;
/**
@@ -130,4 +137,85 @@
return R.ok(sysSimpleUserVoList);
}
+ /**
+ * @description 通过名称获取活跃度
+ * @author jqs
+ * @date 2023/6/29 17:20
+ * @param name
+ * @return R<Activeness>
+ */
+ @PostMapping("/getActivenessByName")
+ public R<Activeness> getActivenessByName(@RequestBody String name)
+ {
+ Activeness activeness = activenessService.getActivenessByName(name);
+ 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);
+ }
}
--
Gitblit v1.7.1