From 8cdcf6c014a6c020045149a7c9ba15ff267ab176 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Thu, 15 Dec 2022 20:48:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=94=A8=E6=88=B7=EF=BC=8C=E9=83=A8?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/modules/common/base/BaseDTO.java | 12 ++++----- .../nl/modules/system/domain/vo/DeptVo.java | 17 ++++++------ .../modules/system/service/dto/DeptTree.java | 3 ++- .../system/service/impl/DeptServiceImpl.java | 10 +++---- .../controller/dept/DeptController.java | 12 ++++++--- .../controller/user/UserController.java | 3 ++- .../system/service/dept/ISysDeptService.java | 5 +++- .../nl/system/service/dept/dto/DeptQuery.java | 2 +- .../service/dept/impl/SysDeptServiceImpl.java | 27 +++++++------------ .../user/dao/mapper/SysUserMapper.java | 3 +++ .../service/user/dao/mapper/SysUserMapper.xml | 4 +-- 11 files changed, 50 insertions(+), 48 deletions(-) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java index 1cab58a..2a277af 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java @@ -16,20 +16,20 @@ import java.util.Date; @Data public class BaseDTO implements Serializable { - private String create_name; + private String createName; - private Long create_id; + private Long createId; - private String update_optname; + private String updateOptname; - private Long update_optid; + private Long updateOptid; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JSONField(format = "yyyy-MM-dd HH:mm:ss") - private Date create_time; + private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JSONField(format = "yyyy-MM-dd HH:mm:ss") - private Date update_time; + private Date updateTime; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/vo/DeptVo.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/vo/DeptVo.java index 065f255..46be8d6 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/vo/DeptVo.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/vo/DeptVo.java @@ -37,15 +37,15 @@ import java.util.List; public class DeptVo extends BaseDTO implements Serializable { - private Long dept_id; + private Long deptId; private String code; - private String ext_id; + private String extId; @ApiModelProperty(value = "排序") - private Integer dept_sort; + private Integer deptSort; @NotBlank @@ -54,22 +54,21 @@ public class DeptVo extends BaseDTO implements Serializable { @NotNull @ApiModelProperty(value = "是否启用") - private String is_used; + private String isUsed; @ApiModelProperty(value = "上级部门") private Long pid; @ApiModelProperty(value = "子节点数目", hidden = true) - private Integer sub_count = 0; + private Integer subCount = 0; //前端显示 private Boolean hasChildren =Boolean.FALSE; - private List children; - public void setSub_count(Integer sub_count) { - this.sub_count = sub_count; - if (sub_count>0){ + public void setSubCount(Integer subCount) { + this.subCount = subCount; + if (subCount>0){ this.hasChildren=Boolean.TRUE; } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/DeptTree.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/DeptTree.java index 20c8dbd..068540d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/DeptTree.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/DeptTree.java @@ -32,9 +32,10 @@ import java.util.Objects; @Setter public class DeptTree implements Serializable { - private Long Dept_id; + private Long deptId; private Long pid; + private String name; @JsonInclude(JsonInclude.Include.NON_EMPTY) private List children; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java index a566b79..debd5e4 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java @@ -130,10 +130,10 @@ public class DeptServiceImpl implements DeptService { CurrentUser user = SecurityUtils.getCurrentUser(); dept.setSub_count(0); dept.setCode(UUID.randomUUID().toString()); - dept.setCreate_time(new Date()); - dept.setUpdate_time(new Date()); - dept.setCreate_id(user.getId()); - dept.setCreate_name(user.getUsername()); + dept.setCreateTime(new Date()); + dept.setUpdateTime(new Date()); + dept.setCreateId(user.getId()); + dept.setCreateName(user.getUsername()); WQLObject.getWQLObject("sys_dept").insert(JSONObject.parseObject(JSON.toJSONString(dept))); // 清理缓存 @@ -215,7 +215,7 @@ public class DeptServiceImpl implements DeptService { trees.add(deptDTO); } for (DeptTree it : deptDtos) { - if (it.getPid() != null && deptDTO.getDept_id().equals(it.getPid())) { + if (it.getPid() != null && deptDTO.getDeptId().equals(it.getPid())) { isChild = true; if (deptDTO.getChildren() == null) { deptDTO.setChildren(new ArrayList<>()); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java index 7e8a990..c3309f1 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java @@ -17,10 +17,16 @@ package org.nl.system.controller.dept; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; import org.nl.modules.common.utils.PageUtil; +import org.nl.modules.system.domain.vo.DeptVo; +import org.nl.modules.system.util.CopyUtil; import org.nl.system.service.dept.ISysDeptService; import org.nl.system.service.dept.dao.SysDept; import org.nl.system.service.dept.dto.DeptQuery; @@ -53,9 +59,9 @@ public class DeptController { @ApiOperation("查询部门") @GetMapping("/vo") - public ResponseEntity queryvo(DeptQuery query) throws Exception { - List sysDepts = deptService.queryVo(query); - return new ResponseEntity<>(PageUtil.toPage(sysDepts, sysDepts.size()),HttpStatus.OK); + public ResponseEntity queryvo(DeptQuery query, PageQuery pageQuery) throws Exception { + Page deptPage = deptService.queryVo(query, pageQuery); + return new ResponseEntity((TableDataInfo.build(deptPage)),HttpStatus.OK); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java index b48f67d..f2bb854 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java @@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.modules.common.config.RsaProperties; import org.nl.modules.common.exception.BadRequestException; @@ -65,7 +66,7 @@ public class UserController { // @SaCheckPermission("user:list") public ResponseEntity query(UserQuery query, PageQuery page){ Page pageable = userService.page(page.build(), query.build()); - return new ResponseEntity<>(null,HttpStatus.OK); + return new ResponseEntity<>(TableDataInfo.build(pageable),HttpStatus.OK); } @Log("新增用户") diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java index 87e762a..2b5880a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/ISysDeptService.java @@ -1,6 +1,8 @@ package org.nl.system.service.dept; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.system.service.dept.dao.SysDept; import org.nl.system.service.dept.dto.DeptQuery; @@ -19,9 +21,10 @@ public interface ISysDeptService extends IService { /** * 条件查询 * @param query + * @param pageQuery * @return */ - List queryVo(DeptQuery query); + Page queryVo(DeptQuery query, PageQuery pageQuery); /** * 条件查询树结构 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptQuery.java index 478170c..6861e2f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptQuery.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptQuery.java @@ -27,7 +27,7 @@ public class DeptQuery extends BaseQuery { @Override public void paramMapping() { - super.doP.put("pidIsNull", QParam.builder().k(new String[]{"pid"}).type(QueryTEnum.LK).build()); + super.doP.put("pidIsNull", QParam.builder().k(new String[]{"pid"}).type(QueryTEnum.NO).build()); super.doP.put("deptIds", QParam.builder().k(new String[]{"deptId"}).type(QueryTEnum.IN).build()); } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java index 2a46ec9..7f6922d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java @@ -1,11 +1,10 @@ package org.nl.system.service.dept.impl; import cn.hutool.core.collection.CollectionUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; -import org.nl.modules.system.domain.Dept; +import org.nl.common.domain.query.PageQuery; import org.nl.modules.system.domain.vo.DeptVo; import org.nl.modules.system.service.dto.DeptTree; import org.nl.modules.system.util.CopyUtil; @@ -52,7 +51,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl trees.add(deptDTO); } for (DeptTree it : deptDtos) { - if (it.getPid() != null && deptDTO.getDept_id().equals(it.getPid())) { + if (it.getPid() != null && deptDTO.getDeptId().equals(it.getPid())) { isChild = true; if (deptDTO.getChildren() == null) { deptDTO.setChildren(new ArrayList<>()); @@ -66,7 +65,6 @@ public class SysDeptServiceImpl extends ServiceImpl impl depts.add(deptDTO); } } - Map map = new HashMap<>(2); map.put("totalElements", deptDtos.size()); map.put("content", CollectionUtil.isEmpty(trees) ? deptDtos : trees); @@ -74,24 +72,17 @@ public class SysDeptServiceImpl extends ServiceImpl impl } @Override - public List queryVo(DeptQuery query) { - Boolean hasChild = false; + public Page queryVo(DeptQuery query, PageQuery pageQuery) { if (query.getPidIsNull() == null){ if (query.getPid() == null){ query.setPidIsNull(true); } - if (StringUtils.isNotEmpty(query.getName())||!query.getIsUsed()){ - query.setPidIsNull(null); - hasChild=true; - } } - List list = this.list(query.build()); - List deptVos = CopyUtil.copyList(list, DeptVo.class); - if (hasChild){ - deptVos.forEach(a->{ - a.setHasChildren(false); - }); + Page page = this.page(pageQuery.build(), query.build()); + page.setRecords(CopyUtil.copyList(page.getRecords(), DeptVo.class)); + if (StringUtils.isNotEmpty(query.getName())){ + page.getRecords().forEach(a->((DeptVo)a).setHasChildren(false) ); } - return list; + return page; } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java index 2061d2a..5172546 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java @@ -1,6 +1,7 @@ package org.nl.system.service.user.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Select; import org.nl.system.service.user.dao.SysUser; import java.util.List; @@ -16,5 +17,7 @@ import java.util.List; public interface SysUserMapper extends BaseMapper { List selectAl(); + @Select("select * from sys_user") + List selectAl2(); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml index 767b972..ecf1b48 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml @@ -1,7 +1,5 @@ - +