From b39a20d6b37f96e1d44c6c194ce56bd30593e3ad Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 29 八月 2024 22:20:31 +0800
Subject: [PATCH] 登录用用户昵称了
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java
index 4126b65..66fd587 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java
@@ -3,14 +3,28 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.Meeting;
+import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfClan;
+import com.ruoyi.domain.ZfClean;
+import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfClanService;
+import com.ruoyi.system.mapper.SysUserRoleMapper;
+import com.ruoyi.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import java.util.List;
import static com.ruoyi.common.core.page.TableSupport.*;
@@ -20,11 +34,31 @@
@Autowired
ZfClanService zfClanService;
+ @Autowired
+ private ISysUserService userService;
+
+ @Resource
+ ZInfoUserService zInfoUserService;
+
+ @Resource
+ private SysUserRoleMapper sysUserRoleMapper;
+
@GetMapping("/all")
public AjaxResult listAll(ZfClan zfClan){
- Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NO), 1);
+ Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return zfClanService.selectDataList(zfClan, pageNo, pageSize);
+ }
+ @GetMapping("/allZfInfo")
+ public AjaxResult listAllInfo(){
+
+ return zfClanService.selectData();
+ }
+
+
+ @GetMapping("/satisfy")
+ public AjaxResult listSatisfy(ZfClan zfClan){
+ return zfClanService.selectDataList(zfClan);
}
/**
@@ -34,8 +68,12 @@
@PostMapping
public AjaxResult add(@RequestBody ZfClan zfClan)
{
+
+
+
return zfClanService.addData(zfClan);
}
+
/**
* 淇敼瀹舵棌
@@ -46,6 +84,12 @@
return zfClanService.updateData(zfClan);
}
+ private void deleteUser(Long clanId){
+ List<ZInfoUser> allMember = zInfoUserService.selectByClanId(clanId.intValue());
+ for (ZInfoUser member: allMember) {
+ userService.deleteUserById(member.getSysId());
+ }
+ }
/**
* 鎵归噺鍒犻櫎瀹舵棌
@@ -53,7 +97,21 @@
@Log(title = "瀹舵棌", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long ids) {
+ deleteUser(ids);
return zfClanService.deleteData(ids);
}
+ /**
+ * 瀵煎嚭璁板綍
+ */
+ @Log(title = "瀹舵棌璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ZfClan zfClean)
+ {
+ List<ZfClan> list = zfClanService.selectByCondition(zfClean);
+ // log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfClan> util = new ExcelUtil<>(ZfClan.class);
+ util.exportExcel(response, list, "瀹舵棌鍙�");
+ }
+
}
--
Gitblit v1.9.1