From df18a89ffc1c97884207897f3876602f2addecdb Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:45:17 +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 | 151 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 146 insertions(+), 5 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 93bfc4e..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
@@ -1,16 +1,26 @@
package com.ruoyi.system.controller.conslole;
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.poji.config.Activeness;
-import com.ruoyi.system.service.config.ActivenessService;
-import com.ruoyi.system.service.config.SysClassificationService;
-import com.ruoyi.system.service.config.SysTagService;
-import org.springframework.web.bind.annotation.*;
+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.sys.ISysUserService;
+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 javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
/**
* @author jqs34
@@ -31,6 +41,16 @@
@Resource
private SysClassificationService sysClassificationService;
+
+ @Resource
+ private ISysUserService sysUserService;
+
+ @Resource
+ private DelayTaskService delayTaskService;
+
+ @Resource
+ private CustomConfigService customConfigService;
+
/**
* 获取系统标签
@@ -77,4 +97,125 @@
SysClassification sysClassification = sysClassificationService.getById(classId);
return R.ok(sysClassification);
}
+
+ /**
+ * 通过ids获取分类
+ * @return
+ */
+ @PostMapping("/getSysClassificationList")
+ public R<Map<Long,SysClassification>> getSysClassificationList(@RequestBody List<Long> classIds)
+ {
+ Map<Long,SysClassification> sysClassificationMap = sysClassificationService.getSysClassificationList(classIds);
+ return R.ok(sysClassificationMap);
+ }
+
+ /**
+ * @description 获取部门用户
+ * @author jqs
+ * @date 2023/6/21 16:00
+ * @param userIdByDept
+ * @return R<MgtShopIdByCodeDto>
+ */
+ @PostMapping("/getUserIdByDept")
+ public R<MgtUserIdByDept> getUserIdByDept(@RequestBody MgtUserIdByDept userIdByDept)
+ {
+ userIdByDept = sysUserService.getUserIdByDept(userIdByDept);
+ return R.ok(userIdByDept);
+ }
+
+ /**
+ * @description 通过id获取用户简易信息
+ * @author jqs
+ * @date 2023/6/25 14:41
+ * @param mgtBaseBathDto
+ * @return R<List<MgtSysSimpleUserVo>>
+ */
+ @PostMapping("/listSimpleUserVo")
+ public R<List<MgtSysSimpleUserVo>> listSimpleUserVo(@RequestBody MgtBaseBathDto mgtBaseBathDto)
+ {
+ List<MgtSysSimpleUserVo> sysSimpleUserVoList = sysUserService.listSimpleUserVo(mgtBaseBathDto);
+ 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