From 8e749f36afe3ee1ae14198262f5da36d67337106 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 29 Jun 2021 15:06:19 +0800
Subject: [PATCH] 1.群管理
---
src/main/java/org/springblade/modules/chatrg/controller/ChatgroupController.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/chatrg/controller/ChatgroupController.java b/src/main/java/org/springblade/modules/chatrg/controller/ChatgroupController.java
index 809331e..c094a7f 100644
--- a/src/main/java/org/springblade/modules/chatrg/controller/ChatgroupController.java
+++ b/src/main/java/org/springblade/modules/chatrg/controller/ChatgroupController.java
@@ -23,16 +23,24 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
+import org.springblade.common.vo.DeptVo;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.chatrg.entity.Chatgroup;
import org.springblade.modules.chatrg.vo.ChatgroupVO;
import org.springblade.modules.chatrg.service.IChatgroupService;
import org.springblade.core.boot.ctrl.BladeController;
+
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* 控制器
@@ -47,6 +55,7 @@
public class ChatgroupController extends BladeController {
private final IChatgroupService chatgroupService;
+ private final IUserService iUserService;
/**
* 详情
@@ -67,6 +76,22 @@
@ApiOperation(value = "分页", notes = "传入chatgroup")
public R<IPage<Chatgroup>> list(Chatgroup chatgroup, Query query) {
IPage<Chatgroup> pages = chatgroupService.page(Condition.getPage(query), Condition.getQueryWrapper(chatgroup));
+ List<Map<String, Object>> list = iUserService.selectUser();
+ for (int i=0;i<pages.getTotal();i++){
+ StringBuffer deptNameBuiffer = new StringBuffer();
+ String groupmember = pages.getRecords().get(i).getGroupmember();
+ String[] split =groupmember.split(",");
+ List<String> lists = Arrays.asList(split);
+ //数据匹配封装
+ for (String deptId:lists) {
+ for (Map<String, Object> deptVo:list) {
+ if (deptId.equals(deptVo.get("groupmember").toString())){
+ deptNameBuiffer.append(deptVo.get("rname")).append("/");
+ }
+ }
+ }
+ pages.getRecords().get(i).setGroupmember(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
+ }
return R.data(pages);
}
@@ -88,6 +113,10 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入chatgroup")
public R save(@Valid @RequestBody Chatgroup chatgroup) {
+ Date dd = new Date();
+ SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String end = sim.format(dd);
+ chatgroup.setTime(end);
return R.status(chatgroupService.save(chatgroup));
}
@@ -108,6 +137,10 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入chatgroup")
public R submit(@Valid @RequestBody Chatgroup chatgroup) {
+ Date dd = new Date();
+ SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String end = sim.format(dd);
+ chatgroup.setTime(end);
return R.status(chatgroupService.saveOrUpdate(chatgroup));
}
--
Gitblit v1.9.3