From cbc564a7088503ad8cc7af4e1d2ba417d061e615 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 11:35:05 +0800
Subject: [PATCH] 联调bug和统计完善
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 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 c10055e..08e3fa0 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,13 +1,20 @@
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.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.Activeness;
+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 org.springframework.web.bind.annotation.*;
+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;
@@ -32,6 +39,11 @@
@Resource
private SysClassificationService sysClassificationService;
+
+ @Resource
+ private ISysUserService sysUserService;
+
+
/**
* 获取系统标签
@@ -89,4 +101,46 @@
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);
+ }
}
--
Gitblit v1.7.1