大屏项目初始化
This commit is contained in:
@@ -0,0 +1,33 @@
|
||||
package com.mini.mybigscreen.Model.JoinDao;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
public class ModuleLeftUser implements Serializable {
|
||||
|
||||
private LocalDateTime createTime;
|
||||
private String userId;
|
||||
private String userName;
|
||||
private String password;
|
||||
private String uname;
|
||||
|
||||
private Integer sex;
|
||||
private String email;
|
||||
|
||||
private String phone;
|
||||
private String roleId;
|
||||
|
||||
private String ustatus;
|
||||
|
||||
private Integer loginCount;
|
||||
private String lastLoginIp;
|
||||
|
||||
|
||||
private String moduleName;
|
||||
|
||||
private String moduleCode;
|
||||
}
|
||||
@@ -10,5 +10,10 @@ public class ModuleUser implements Serializable {
|
||||
|
||||
private String moduleId;
|
||||
private String moduleName;
|
||||
private String moduleCode;
|
||||
private String path;
|
||||
private String titleName;
|
||||
private String remark;
|
||||
private String ustatus;
|
||||
private List<String> userIds;
|
||||
}
|
||||
|
||||
@@ -1,13 +1,22 @@
|
||||
package com.mini.mybigscreen.biz.controller;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.mini.mybigscreen.Model.JoinDao.ModuleLeftUser;
|
||||
import com.mini.mybigscreen.Model.Message;
|
||||
import com.mini.mybigscreen.Model.PageResult;
|
||||
import com.mini.mybigscreen.Model.Result;
|
||||
import com.mini.mybigscreen.biz.domain.HomeModule;
|
||||
import com.mini.mybigscreen.biz.domain.HomeModuleUser;
|
||||
import com.mini.mybigscreen.biz.domain.HomeRole;
|
||||
import com.mini.mybigscreen.biz.domain.HomeUser;
|
||||
import com.mini.mybigscreen.biz.service.HomeModuleService;
|
||||
import com.mini.mybigscreen.utils.PageUtil;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -24,19 +33,44 @@ public class HomeModuleController {
|
||||
@Resource
|
||||
private HomeModuleService moduleService;
|
||||
|
||||
@Resource
|
||||
private MPJBaseMapper homeUserMapper;
|
||||
|
||||
|
||||
@GetMapping("list")
|
||||
public Result<?> getList() {
|
||||
public Result<?> getList(Integer pageNum, Integer pageSize,
|
||||
String moduleId, String userName, String uname, String ustatus) {
|
||||
MPJLambdaWrapper<ModuleLeftUser> wrapper = new MPJLambdaWrapper<ModuleLeftUser>()
|
||||
.selectAll(HomeUser.class)
|
||||
.select(HomeModule::getModuleName, HomeModule::getModuleCode)
|
||||
.leftJoin(HomeModuleUser.class, HomeModuleUser::getUserId, HomeUser::getUserId)
|
||||
.leftJoin(HomeModule.class, HomeModule::getModuleId, HomeModuleUser::getModuleId)
|
||||
.like(StrUtil.isNotBlank(uname), HomeUser::getUname, uname)
|
||||
.eq(StrUtil.isNotBlank(ustatus), HomeUser::getUstatus, ustatus)
|
||||
.eq(StrUtil.isNotBlank(userName), HomeUser::getUserName, userName)
|
||||
.eq(StrUtil.isNotBlank(moduleId), HomeModuleUser::getModuleId, moduleId)
|
||||
.orderByDesc(HomeUser::getCreateTime);
|
||||
List<ModuleLeftUser> list = homeUserMapper.selectJoinList(ModuleLeftUser.class, wrapper);
|
||||
PageUtil<?> util = new PageUtil<>(pageNum, pageSize, list);
|
||||
PageResult<?> result = new PageResult<>(util.OkData(), pageNum, pageSize, list.size());
|
||||
return Result.success(result);
|
||||
}
|
||||
|
||||
@GetMapping("listAll")
|
||||
public Result<?> getListAll() {
|
||||
return Result.success(moduleService.list());
|
||||
}
|
||||
|
||||
public Result<Message> save() {
|
||||
@PostMapping("save")
|
||||
public Result<Message> save(@RequestBody HomeModule homeModule) {
|
||||
moduleService.save(homeModule);
|
||||
return Result.success(new Message("数据新增成功", 200));
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("delete")
|
||||
public Result<Message> delete(String moduleId) {
|
||||
System.out.println(moduleId);
|
||||
moduleService.removeById(moduleId);
|
||||
return Result.success(new Message("数据删除成功", 200));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,8 +7,10 @@ import com.mini.mybigscreen.Model.ModuleUser;
|
||||
import com.mini.mybigscreen.Model.Result;
|
||||
import com.mini.mybigscreen.biz.domain.HomeModule;
|
||||
import com.mini.mybigscreen.biz.domain.HomeModuleUser;
|
||||
import com.mini.mybigscreen.biz.domain.HomeRoleMenu;
|
||||
import com.mini.mybigscreen.biz.domain.HomeUser;
|
||||
import com.mini.mybigscreen.biz.mapper.HomeModuleMapper;
|
||||
import com.mini.mybigscreen.biz.service.HomeModuleService;
|
||||
import com.mini.mybigscreen.biz.service.HomeModuleUserService;
|
||||
import com.mini.mybigscreen.biz.service.HomeUserService;
|
||||
import jakarta.annotation.Resource;
|
||||
@@ -17,6 +19,7 @@ import jakarta.servlet.http.HttpSession;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -34,6 +37,10 @@ public class HomeModuleUserController {
|
||||
@Resource
|
||||
private HomeUserService userService;
|
||||
|
||||
|
||||
@Resource
|
||||
private HomeModuleService moduleService;
|
||||
|
||||
@Resource
|
||||
private HomeModuleMapper homeModuleMapper;
|
||||
|
||||
@@ -73,7 +80,27 @@ public class HomeModuleUserController {
|
||||
|
||||
@PostMapping("save")
|
||||
public Result<Message> save(@RequestBody ModuleUser moduleUser) {
|
||||
return Result.success(new Message("数据新增成功", 200));
|
||||
HomeModule module = moduleService.getById(moduleUser.getModuleId());
|
||||
module.setModuleName(moduleUser.getModuleName());
|
||||
module.setModuleCode(moduleUser.getModuleCode());
|
||||
module.setPath(moduleUser.getPath());
|
||||
module.setTitleName(moduleUser.getTitleName());
|
||||
module.setRemark(moduleUser.getRemark());
|
||||
module.setUstatus(moduleUser.getUstatus());
|
||||
moduleService.updateById(module);
|
||||
moduleUserService.remove(new LambdaQueryWrapper<HomeModuleUser>()
|
||||
.eq(HomeModuleUser::getModuleId, moduleUser.getModuleId()));
|
||||
List<HomeModuleUser> newModuleUsers = moduleUser.getUserIds().stream()
|
||||
.map(userId -> {
|
||||
HomeModuleUser homeModuleUser = new HomeModuleUser();
|
||||
homeModuleUser.setModuleId(moduleUser.getModuleId());
|
||||
homeModuleUser.setUserId(userId);
|
||||
homeModuleUser.setUstatus("1");
|
||||
return homeModuleUser;
|
||||
})
|
||||
.collect(Collectors.toList());
|
||||
moduleUserService.saveBatch(newModuleUsers);
|
||||
return Result.success(new Message("数据授权成功", 200));
|
||||
}
|
||||
|
||||
@PostMapping("delete")
|
||||
|
||||
@@ -2,14 +2,18 @@ package com.mini.mybigscreen.biz.controller;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.mini.mybigscreen.Model.Message;
|
||||
import com.mini.mybigscreen.Model.PageResult;
|
||||
import com.mini.mybigscreen.Model.Result;
|
||||
import com.mini.mybigscreen.Model.RoleAssignPerm;
|
||||
import com.mini.mybigscreen.biz.domain.ErpCategory;
|
||||
import com.mini.mybigscreen.biz.domain.HomeRole;
|
||||
import com.mini.mybigscreen.biz.domain.HomeRoleMenu;
|
||||
import com.mini.mybigscreen.biz.domain.HomeUser;
|
||||
import com.mini.mybigscreen.biz.service.HomeRoleMenuService;
|
||||
import com.mini.mybigscreen.biz.service.HomeRoleService;
|
||||
import com.mini.mybigscreen.utils.PageUtil;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@@ -34,12 +38,35 @@ public class HomeRoleController {
|
||||
@Resource
|
||||
private HomeRoleService roleService;
|
||||
|
||||
@Resource
|
||||
private MPJBaseMapper<HomeUser> homeUserMapper;
|
||||
|
||||
|
||||
@GetMapping("list")
|
||||
public Result<?> getList() {
|
||||
return Result.success(roleService.list());
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("userList")
|
||||
public Result<?> getUserList(Integer pageNum, Integer pageSize,
|
||||
String roleId, String userName, String uname, String ustatus) {
|
||||
MPJLambdaWrapper<HomeUser> wrapper = new MPJLambdaWrapper<HomeUser>()
|
||||
.selectAll(HomeUser.class)
|
||||
.select(HomeRole::getRoleName)
|
||||
.leftJoin(HomeRole.class, HomeRole::getRoleId, HomeUser::getRoleId)
|
||||
.like(StrUtil.isNotBlank(uname), HomeUser::getUname, uname)
|
||||
.eq(StrUtil.isNotBlank(ustatus), HomeUser::getUstatus, ustatus)
|
||||
.eq(StrUtil.isNotBlank(userName), HomeUser::getUserName, userName)
|
||||
.eq(StrUtil.isNotBlank(roleId), HomeUser::getRoleId, roleId)
|
||||
.orderByDesc(HomeUser::getCreateTime);
|
||||
List<HomeUser> list = homeUserMapper.selectList(wrapper);
|
||||
PageUtil<?> util = new PageUtil<>(pageNum, pageSize, list);
|
||||
PageResult<?> result = new PageResult<>(util.OkData(), pageNum, pageSize, list.size());
|
||||
return Result.success(result);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 角色授权
|
||||
*/
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
package com.mini.mybigscreen.biz.controller;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.poi.excel.BigExcelWriter;
|
||||
import cn.hutool.poi.excel.ExcelUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
@@ -11,9 +14,13 @@ import com.mini.mybigscreen.biz.domain.HomeUser;
|
||||
import com.mini.mybigscreen.biz.service.HomeUserService;
|
||||
import com.mini.mybigscreen.utils.PageUtil;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.springframework.util.StringUtils;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.io.OutputStream;
|
||||
import java.net.URLEncoder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -52,7 +59,6 @@ public class HomeUserController {
|
||||
return Result.success(result);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("save")
|
||||
public Result<Message> save(@RequestBody HomeUser homeUser) {
|
||||
boolean success = homeUser.getIsEdit()
|
||||
|
||||
@@ -42,5 +42,5 @@ public class HomeModuleUser extends BaseEntity implements Serializable {
|
||||
private String moduleId;
|
||||
|
||||
@TableField("ustatus")
|
||||
private Integer ustatus;
|
||||
private String ustatus;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user