Skip to content

huang.tao / jmai-platform

Go to a project
Commit 0f5a6a8c by huangtao
Options

physic

parent 5eaa647a
Inline Side-by-side
Showing with 248 additions and 287 deletions
jmai-sys/src/main/java/com/jmai/sys/controller/OrganizationController.java → jmai-sys/src/main/java/com/jmai/sys/controller/DeptController.java
...@@ -3,7 +3,7 @@ package com.jmai.sys.controller; ...@@ -3,7 +3,7 @@ package com.jmai.sys.controller;
import com.jmai.sys.aop.Auth; import com.jmai.sys.aop.Auth;
import com.jmai.sys.dto.*; import com.jmai.sys.dto.*;
import com.jmai.sys.service.OrganizationService; import com.jmai.sys.service.DeptService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
...@@ -18,41 +18,41 @@ import java.util.List; ...@@ -18,41 +18,41 @@ import java.util.List;
@Slf4j @Slf4j
@Auth @Auth
@RestController @RestController
@RequestMapping("/organization") @RequestMapping("/dept")
@Api(tags = "组织") @Api(tags = "组织")
@ApiImplicitParams({@ApiImplicitParam(paramType = "header", name = "Access-Token", value = "凭证", required = true, dataType = "string")}) @ApiImplicitParams({@ApiImplicitParam(paramType = "header", name = "Access-Token", value = "凭证", required = true, dataType = "string")})
public class OrganizationController { public class DeptController {
@Resource @Resource
private OrganizationService organizationService; private DeptService deptService;
@PostMapping("/listOrganization") @PostMapping("/listDept")
@ApiOperation(value = "查询组织列表", notes = "") @ApiOperation(value = "查询组织列表", notes = "")
public ResponseData<List<OrganizationDto>> listOrganization(@RequestBody @Valid OrganizationQueryReq req) { public ResponseData<List<DeptDto>> listDept(@RequestBody @Valid DeptQueryReq req) {
List<OrganizationDto> page = organizationService.listOrganization(req); List<DeptDto> page = deptService.listDept(req);
return ResponseData.ok(page); return ResponseData.ok(page);
} }
@PostMapping("/getOrganization") @PostMapping("/getDept")
@ApiOperation(value = "获取组织信息", notes = "") @ApiOperation(value = "获取组织信息", notes = "")
public ResponseData<OrganizationDto> getOrganization(@RequestParam("organizationId") Long organizationId) { public ResponseData<DeptDto> getDept(@RequestParam("deptId") Long deptId) {
OrganizationDto dto = organizationService.getOrganizationOrThrow(organizationId); DeptDto dto = deptService.getDeptOrThrow(deptId);
return ResponseData.ok(dto); return ResponseData.ok(dto);
} }
@PostMapping("/createOrganization") @PostMapping("/createDept")
@ApiOperation(value = "创建组织", notes = "") @ApiOperation(value = "创建组织", notes = "")
public ResponseData<OrganizationDto> createWarehouse(@RequestBody @Valid OrganizationCreateReq req) { public ResponseData<DeptDto> createWarehouse(@RequestBody @Valid DeptCreateReq req) {
OrganizationDto dto = organizationService.createOrganization(req); DeptDto dto = deptService.createDept(req);
return ResponseData.ok(dto); return ResponseData.ok(dto);
} }
@PostMapping("/updateOrganization") @PostMapping("/updateDept")
@ApiOperation(value = "更新组织信息", notes = "") @ApiOperation(value = "更新组织信息", notes = "")
public ResponseData<OrganizationDto> updateWarehouse(@RequestBody @Valid OrganizationUpdateReq req) { public ResponseData<DeptDto> updateWarehouse(@RequestBody @Valid DeptUpdateReq req) {
OrganizationDto dto = organizationService.updateOrganization(req); DeptDto dto = deptService.updateDept(req);
return ResponseData.ok(dto); return ResponseData.ok(dto);
} }
} }
jmai-sys/src/main/java/com/jmai/sys/dto/OrganizationCreateReq.java → jmai-sys/src/main/java/com/jmai/sys/dto/DeptCreateReq.java
...@@ -10,11 +10,11 @@ import java.time.LocalDateTime; ...@@ -10,11 +10,11 @@ import java.time.LocalDateTime;
@Data @Data
@ApiModel @ApiModel
public class OrganizationCreateReq extends BaseReq { public class DeptCreateReq extends BaseReq {
@ApiModelProperty(value = "组织名称") @ApiModelProperty(value = "组织名称")
private String organizationName; private String deptName;
@ApiModelProperty(value = "备注描述") @ApiModelProperty(value = "备注描述")
private String remark; private String remark;
......
jmai-sys/src/main/java/com/jmai/sys/dto/OrganizationDto.java → jmai-sys/src/main/java/com/jmai/sys/dto/DeptDto.java
...@@ -6,12 +6,12 @@ import lombok.Data; ...@@ -6,12 +6,12 @@ import lombok.Data;
@Data @Data
@ApiModel(description = "组织") @ApiModel(description = "组织")
public class OrganizationDto { public class DeptDto {
@ApiModelProperty(value = "组织ID") @ApiModelProperty(value = "组织ID")
private Long organizationId; private Long deptId;
@ApiModelProperty(value = "组织名称") @ApiModelProperty(value = "组织名称")
private String organizationName; private String deptName;
@ApiModelProperty(value = "层级") @ApiModelProperty(value = "层级")
private Integer level; private Integer level;
......
jmai-sys/src/main/java/com/jmai/sys/dto/OrganizationQueryReq.java → jmai-sys/src/main/java/com/jmai/sys/dto/DeptQueryReq.java
...@@ -14,12 +14,12 @@ import java.util.List; ...@@ -14,12 +14,12 @@ import java.util.List;
*/ */
@Data @Data
@ApiModel @ApiModel
public class OrganizationQueryReq extends PageReq { public class DeptQueryReq extends PageReq {
@ApiModelProperty(value = "组织ID") @ApiModelProperty(value = "组织ID")
private Long organizationId; private Long deptId;
@ApiModelProperty(value = "组织名称") @ApiModelProperty(value = "组织名称")
private String organizationName; private String deptName;
@ApiModelProperty(value = "层级") @ApiModelProperty(value = "层级")
private Integer level; private Integer level;
......
jmai-sys/src/main/java/com/jmai/sys/dto/OrganizationUpdateReq.java → jmai-sys/src/main/java/com/jmai/sys/dto/DeptUpdateReq.java
...@@ -9,13 +9,13 @@ import java.time.LocalDateTime; ...@@ -9,13 +9,13 @@ import java.time.LocalDateTime;
@Data @Data
@ApiModel @ApiModel
public class OrganizationUpdateReq extends BaseReq { public class DeptUpdateReq extends BaseReq {
@ApiModelProperty(value = "组织ID") @ApiModelProperty(value = "组织ID")
private Long organizationId; private Long deptId;
@ApiModelProperty(value = "组织名称") @ApiModelProperty(value = "组织名称")
private String organizationName; private String deptName;
@ApiModelProperty(value = "备注描述") @ApiModelProperty(value = "备注描述")
private String remark; private String remark;
......
jmai-sys/src/main/java/com/jmai/sys/dto/FullUserDto.java
...@@ -18,15 +18,15 @@ import static com.jmai.sys.service.UserService.KEY_ALL; ...@@ -18,15 +18,15 @@ import static com.jmai.sys.service.UserService.KEY_ALL;
@ApiModel(description = "用户信息") @ApiModel(description = "用户信息")
public class FullUserDto extends UserDto implements IDataPerms { public class FullUserDto extends UserDto implements IDataPerms {
@ApiModelProperty(value = "授权组织（编号）列表（逗号隔开）") @ApiModelProperty(value = "授权组织（编号）列表（逗号隔开）")
private String organizationIdList; private String deptIdList;
@ApiModelProperty(value = "授权仓库/站点（名称）列表（逗号隔开）") @ApiModelProperty(value = "授权仓库/站点（名称）列表（逗号隔开）")
private String organizationNameList; private String deptNameList;
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
public List<String> getOrganizationIdAsList() { public List<String> getDeptIdAsList() {
return extractStringList(organizationIdList); return extractStringList(deptIdList);
} }
protected List<String> extractStringList(String input) { protected List<String> extractStringList(String input) {
......
jmai-sys/src/main/java/com/jmai/sys/dto/UserDto.java
...@@ -28,15 +28,15 @@ public class UserDto extends BaseDto implements IStatus { ...@@ -28,15 +28,15 @@ public class UserDto extends BaseDto implements IStatus {
private String mobile; private String mobile;
@ApiModelProperty(value = "组织") @ApiModelProperty(value = "组织")
private String authOrganizationList; private String authDeptList;
@ApiModelProperty(value = "状态：0 - 禁用，1 - 启用") @ApiModelProperty(value = "状态：0 - 禁用，1 - 启用")
private Integer status; private Integer status;
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
public List<Long> getOrganizationAsList() { public List<Long> getDeptAsList() {
return extractLongList(authOrganizationList); return extractLongList(authDeptList);
} }
......
jmai-sys/src/main/java/com/jmai/sys/dto/UserUpdateReq.java
...@@ -25,25 +25,25 @@ public class UserUpdateReq { ...@@ -25,25 +25,25 @@ public class UserUpdateReq {
private Long userType; private Long userType;
@ApiModelProperty(value = "组织（ID）列表（逗号隔开）") @ApiModelProperty(value = "组织（ID）列表（逗号隔开）")
private Object authOrganizationList; private Object authDeptList;
@ApiModelProperty(value = "用户角色（ID）列表（逗号隔开）") @ApiModelProperty(value = "用户角色（ID）列表（逗号隔开）")
private Object roleList; private Object roleList;
@ApiModelProperty(value = "组织（ID）") @ApiModelProperty(value = "组织（ID）")
private Long organizationId; private Long deptId;
@ApiModelProperty(value = "状态：0 - 禁用，1 - 启用") @ApiModelProperty(value = "状态：0 - 禁用，1 - 启用")
private Integer status; private Integer status;
public String getAuthOrganizationList() { public String getAuthDeptList() {
return getAuthOrganizationAsList() return getAuthDeptAsList()
.stream() .stream()
.map(String::valueOf) .map(String::valueOf)
.collect(Collectors.joining(",")); .collect(Collectors.joining(","));
} }
public List<Long> getAuthOrganizationAsList() { public List<Long> getAuthDeptAsList() {
return BaseService.extractLongList(authOrganizationList); return BaseService.extractLongList(authDeptList);
} }
public String getRoleList() { public String getRoleList() {
......
jmai-sys/src/main/java/com/jmai/sys/entity/SysOrganization.java → jmai-sys/src/main/java/com/jmai/sys/entity/SysDept.java
...@@ -9,10 +9,10 @@ import lombok.Data; ...@@ -9,10 +9,10 @@ import lombok.Data;
@Data @Data
@ApiModel(description = "组织") @ApiModel(description = "组织")
@TableName("sys_organization") @TableName("sys_dept")
public class SysOrganization extends BaseVersionEntity { public class SysDept extends BaseVersionEntity {
@ApiModelProperty(value = "组织名称") @ApiModelProperty(value = "组织名称")
private String organizationName; private String deptName;
@ApiModelProperty(value = "层级") @ApiModelProperty(value = "层级")
private Integer level; private Integer level;
......
jmai-sys/src/main/java/com/jmai/sys/entity/SysUser.java
...@@ -28,10 +28,10 @@ public class SysUser extends BaseExtEntity implements IStatus { ...@@ -28,10 +28,10 @@ public class SysUser extends BaseExtEntity implements IStatus {
private Long type; private Long type;
@ApiModelProperty(value = "组织（ID）列表（逗号隔开）") @ApiModelProperty(value = "组织（ID）列表（逗号隔开）")
private String authOrganizationList; private String authDeptList;
@ApiModelProperty(value = "组织（ID）") @ApiModelProperty(value = "组织（ID）")
private Long organizationId; private Long deptId;
@ApiModelProperty(value = "用户类型（角色）列表（逗号隔开）") @ApiModelProperty(value = "用户类型（角色）列表（逗号隔开）")
private String roleList; private String roleList;
...@@ -39,8 +39,8 @@ public class SysUser extends BaseExtEntity implements IStatus { ...@@ -39,8 +39,8 @@ public class SysUser extends BaseExtEntity implements IStatus {
@ApiModelProperty(value = "状态：0 - 禁用，1 - 启用") @ApiModelProperty(value = "状态：0 - 禁用，1 - 启用")
private Integer status; private Integer status;
public List<Long> getAuthOrganizationAsList() { public List<Long> getAuthDeptAsList() {
return BaseService.extractLongList(getAuthOrganizationList()); return BaseService.extractLongList(getAuthDeptList());
} }
public List<Long> getRoleAsList() { public List<Long> getRoleAsList() {
......
jmai-sys/src/main/java/com/jmai/sys/entity/SysUserOrganization.java deleted 100644 → 0
package com.jmai.sys.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(description = "用户组织关系")
@TableName("sys_user_organization")
public class SysUserOrganization extends BaseVersionEntity {
@ApiModelProperty(value = "用户ID")
private Long userId;
@ApiModelProperty(value = "组织ID")
private String organization_id;
}
jmai-sys/src/main/java/com/jmai/sys/exception/ErrorCode.java
...@@ -69,8 +69,8 @@ public enum ErrorCode implements ServiceCode { ...@@ -69,8 +69,8 @@ public enum ErrorCode implements ServiceCode {
DEPT_DENIED(90105, "部门/科室数据权限未授权"), DEPT_DENIED(90105, "部门/科室数据权限未授权"),
/* 仓库 */ /* 仓库 */
ORGANIZATION_NOT_FOUND(100001, "组织不存在"), DEPT_NOT_FOUND(100001, "组织不存在"),
ORGANIZATION_NAME_EXISTED(100003, "组织名称已存在"), DEPT_NAME_EXISTED(100003, "组织名称已存在"),
/* 商品 */ /* 商品 */
PRODUCT_NOT_FOUND(200001, "无首营数据"), PRODUCT_NOT_FOUND(200001, "无首营数据"),
......
jmai-sys/src/main/java/com/jmai/sys/mapper/SysUserOrganizationMapper.java → jmai-sys/src/main/java/com/jmai/sys/mapper/SysDeptMapper.java
package com.jmai.sys.mapper; package com.jmai.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jmai.sys.entity.SysOrganization; import com.jmai.sys.entity.SysDept;
import com.jmai.sys.entity.SysUserOrganization;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@Mapper @Mapper
public interface SysUserOrganizationMapper extends BaseMapper<SysUserOrganization> { public interface SysDeptMapper extends BaseMapper<SysDept> {
} }
jmai-sys/src/main/java/com/jmai/sys/mapper/SysOrganizationMapper.java deleted 100644 → 0
package com.jmai.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jmai.sys.entity.SysMenu;
import com.jmai.sys.entity.SysOrganization;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
import java.util.List;
@Mapper
public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
}
jmai-sys/src/main/java/com/jmai/sys/service/DeptService.java 0 → 100644
package com.jmai.sys.service;
import cn.hutool.core.util.ObjectUtil;
import com.jmai.api.exception.ServiceException;
import com.jmai.sys.dto.DeptCreateReq;
import com.jmai.sys.dto.DeptDto;
import com.jmai.sys.dto.DeptQueryReq;
import com.jmai.sys.dto.DeptUpdateReq;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import static com.jmai.sys.exception.ErrorCode.DEPT_NOT_FOUND;
public interface DeptService {
Map<Long, DeptDto> getDeptMap(List<Long> deptIds);
List<DeptDto> listDept(DeptQueryReq req);
default DeptDto getDeptOrThrow(Long deptId) {
return getDept(deptId)
.orElseThrow(() -> new ServiceException(DEPT_NOT_FOUND, "部门："+ deptId));
}
default Optional<DeptDto> getDept(Long deptId) {
DeptQueryReq req = new DeptQueryReq();
req.setDeptId(deptId);
List<DeptDto> list = listDept(req);
return selectOne(list);
}
public static <T> Optional<T> selectOne(List<T> list) {
if (ObjectUtil.isEmpty(list)) {
return Optional.empty();
}
if (list.size() > 1) {
throw new ServiceException("列表大于1");
}
return Optional.of(list.get(0));
}
DeptDto createDept(DeptCreateReq req);
default Optional<DeptDto> getDeptByName(String deptName) {
DeptQueryReq req = new DeptQueryReq();
req.setDeptName(deptName);
List<DeptDto> list = listDept(req);
return selectOne(list);
}
DeptDto updateDept(DeptUpdateReq req);
}
jmai-sys/src/main/java/com/jmai/sys/service/OrganizationService.java deleted 100644 → 0
package com.jmai.sys.service;
import cn.hutool.core.util.ObjectUtil;
import com.jmai.api.exception.ServiceException;
import com.jmai.sys.dto.OrganizationCreateReq;
import com.jmai.sys.dto.OrganizationDto;
import com.jmai.sys.dto.OrganizationQueryReq;
import com.jmai.sys.dto.OrganizationUpdateReq;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import static com.jmai.sys.exception.ErrorCode.ORGANIZATION_NOT_FOUND;
public interface OrganizationService {
Map<Long, OrganizationDto> getOrganizationMap(List<Long> organizationIds);
List<OrganizationDto> listOrganization(OrganizationQueryReq req);
default OrganizationDto getOrganizationOrThrow(Long organizationId) {
return getOrganization(organizationId)
.orElseThrow(() -> new ServiceException(ORGANIZATION_NOT_FOUND, "：" + organizationId));
}
default Optional<OrganizationDto> getOrganization(Long organizationId) {
OrganizationQueryReq req = new OrganizationQueryReq();
req.setOrganizationId(organizationId);
List<OrganizationDto> list = listOrganization(req);
return selectOne(list);
}
public static <T> Optional<T> selectOne(List<T> list) {
if (ObjectUtil.isEmpty(list)) {
return Optional.empty();
}
if (list.size() > 1) {
throw new ServiceException("列表大于1");
}
return Optional.of(list.get(0));
}
OrganizationDto createOrganization(OrganizationCreateReq req);
default Optional<OrganizationDto> getOrganizationByName(String organizationName) {
OrganizationQueryReq req = new OrganizationQueryReq();
req.setOrganizationName(organizationName);
List<OrganizationDto> list = listOrganization(req);
return selectOne(list);
}
OrganizationDto updateOrganization(OrganizationUpdateReq req);
}
jmai-sys/src/main/java/com/jmai/sys/service/impl/DeptServiceImpl.java 0 → 100644
package com.jmai.sys.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jmai.api.exception.ServiceException;
import com.jmai.sys.AbstractService;
import com.jmai.sys.dto.DeptCreateReq;
import com.jmai.sys.dto.DeptDto;
import com.jmai.sys.dto.DeptQueryReq;
import com.jmai.sys.dto.DeptUpdateReq;
import com.jmai.sys.entity.SysDept;
import com.jmai.sys.mapper.SysDeptMapper;
import com.jmai.sys.service.DeptService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
import static com.jmai.sys.exception.ErrorCode.*;
@Slf4j
@Service
public class DeptServiceImpl extends AbstractService implements DeptService {
@Resource
private SysDeptMapper sysDeptMapper;
private DeptDto convertTo(SysDept dept) {
if (ObjectUtil.isEmpty(dept)) {
return null;
}
DeptDto dto = copyTo(dept, new DeptDto());
dto.setDeptId(dept.getId());
return dto;
}
public Map<Long, DeptDto> getDeptMap(List<Long> deptIds) {
if (ObjectUtil.isEmpty(deptIds)) {
return Collections.emptyMap();
}
deptIds = deptIds.stream().distinct().collect(Collectors.toList());
List<SysDept> warehouseList = sysDeptMapper.selectList(Wrappers.lambdaQuery(SysDept.class)
.in(SysDept::getId, deptIds));
return convertToMap(warehouseList, SysDept::getId, this::convertTo);
}
@Override
public List<DeptDto> listDept(DeptQueryReq req){
Wrapper<SysDept> query = buildQuery(req);
List<SysDept> depts = sysDeptMapper.selectList(query);
return convertTo(depts, this::convertTo);
}
@Override
public DeptDto createDept(DeptCreateReq req) {
Optional<DeptDto> existed = getDeptByName(req.getDeptName());
if (existed.isPresent()) {
throw new ServiceException(DEPT_NAME_EXISTED, "：仓库名称=" + req.getDeptName());
}
SysDept dept = copyTo(req, new SysDept());
if(ObjectUtil.isNotEmpty(req.getParentId())){
DeptDto deptOrThrow = getDeptOrThrow(req.getParentId());
Integer level = deptOrThrow.getLevel();
dept.setLevel(level+1);
}
sysDeptMapper.insert(dept);
return convertTo(dept);
}
@Override
public DeptDto updateDept(DeptUpdateReq req) {
SysDept dept = sysDeptMapper.selectById(req.getDeptId());
if (ObjectUtil.isEmpty(dept)) {
throw new ServiceException(DEPT_NOT_FOUND, "部门=" + req.getDeptId());
}
if (ObjectUtil.isNotEmpty(req.getDeptName())
&& !dept.getDeptName().equals(req.getDeptName())) {
Optional<DeptDto> existed = getDeptByName(req.getDeptName());
if (existed.isPresent()) {
throw new ServiceException(DEPT_NAME_EXISTED, "：部门名称=" + req.getDeptName());
}
}
dept = copyTo(req, new SysDept());
sysDeptMapper.updateById(dept);
return convertTo(dept);
}
private Wrapper<SysDept> buildQuery(DeptQueryReq req) {
return Wrappers.lambdaQuery(SysDept.class)
.eq(ObjectUtil.isNotEmpty(req.getLevel()), SysDept::getLevel, req.getLevel())
.eq(ObjectUtil.isNotEmpty(req.getDeptId()), SysDept::getId, req.getDeptId())
.eq(ObjectUtil.isNotEmpty(req.getDeptName()), SysDept::getDeptName, req.getDeptName())
.orderByDesc(SysDept::getCreateTime);
}
}
jmai-sys/src/main/java/com/jmai/sys/service/impl/OrganizationServiceImpl.java deleted 100644 → 0
package com.jmai.sys.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jmai.api.exception.ServiceException;
import com.jmai.sys.AbstractService;
import com.jmai.sys.dto.OrganizationCreateReq;
import com.jmai.sys.dto.OrganizationDto;
import com.jmai.sys.dto.OrganizationQueryReq;
import com.jmai.sys.dto.OrganizationUpdateReq;
import com.jmai.sys.entity.SysOrganization;
import com.jmai.sys.mapper.SysOrganizationMapper;
import com.jmai.sys.service.OrganizationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
import static com.jmai.sys.exception.ErrorCode.ORGANIZATION_NAME_EXISTED;
import static com.jmai.sys.exception.ErrorCode.ORGANIZATION_NOT_FOUND;
@Slf4j
@Service
public class OrganizationServiceImpl extends AbstractService implements OrganizationService {
@Resource
private SysOrganizationMapper sysOrganizationMapper;
private OrganizationDto convertTo(SysOrganization organization) {
if (ObjectUtil.isEmpty(organization)) {
return null;
}
OrganizationDto dto = copyTo(organization, new OrganizationDto());
dto.setOrganizationId(organization.getId());
return dto;
}
public Map<Long, OrganizationDto> getOrganizationMap(List<Long> organizationIds) {
if (ObjectUtil.isEmpty(organizationIds)) {
return Collections.emptyMap();
}
organizationIds = organizationIds.stream().distinct().collect(Collectors.toList());
List<SysOrganization> warehouseList = sysOrganizationMapper.selectList(Wrappers.lambdaQuery(SysOrganization.class)
.in(SysOrganization::getId, organizationIds));
return convertToMap(warehouseList, SysOrganization::getId, this::convertTo);
}
@Override
public List<OrganizationDto> listOrganization(OrganizationQueryReq req){
Wrapper<SysOrganization> query = buildQuery(req);
List<SysOrganization> organizations = sysOrganizationMapper.selectList(query);
return convertTo(organizations, this::convertTo);
}
@Override
public OrganizationDto createOrganization(OrganizationCreateReq req) {
Optional<OrganizationDto> existed = getOrganizationByName(req.getOrganizationName());
if (existed.isPresent()) {
throw new ServiceException(ORGANIZATION_NAME_EXISTED, "：仓库名称=" + req.getOrganizationName());
}
SysOrganization organization = copyTo(req, new SysOrganization());
if(ObjectUtil.isNotEmpty(req.getParentId())){
OrganizationDto organizationOrThrow = getOrganizationOrThrow(req.getParentId());
Integer level = organizationOrThrow.getLevel();
organization.setLevel(level+1);
}
sysOrganizationMapper.insert(organization);
return convertTo(organization);
}
@Override
public OrganizationDto updateOrganization(OrganizationUpdateReq req) {
SysOrganization organization = sysOrganizationMapper.selectById(req.getOrganizationId());
if (ObjectUtil.isEmpty(organization)) {
throw new ServiceException(ORGANIZATION_NOT_FOUND, "仓库=" + req.getOrganizationId());
}
if (ObjectUtil.isNotEmpty(req.getOrganizationName())
&& !organization.getOrganizationName().equals(req.getOrganizationName())) {
Optional<OrganizationDto> existed = getOrganizationByName(req.getOrganizationName());
if (existed.isPresent()) {
throw new ServiceException(ORGANIZATION_NAME_EXISTED, "：仓库名称=" + req.getOrganizationName());
}
}
organization = copyTo(req, new SysOrganization());
sysOrganizationMapper.updateById(organization);
return convertTo(organization);
}
private Wrapper<SysOrganization> buildQuery(OrganizationQueryReq req) {
return Wrappers.lambdaQuery(SysOrganization.class)
.eq(ObjectUtil.isNotEmpty(req.getLevel()), SysOrganization::getLevel, req.getLevel())
.eq(ObjectUtil.isNotEmpty(req.getOrganizationId()), SysOrganization::getId, req.getOrganizationId())
.eq(ObjectUtil.isNotEmpty(req.getOrganizationName()), SysOrganization::getOrganizationName, req.getOrganizationName())
.orderByDesc(SysOrganization::getCreateTime);
}
}
jmai-sys/src/main/java/com/jmai/sys/service/impl/UserServiceImpl.java
...@@ -27,7 +27,7 @@ import com.jmai.sys.mapper.SysUserMapper; ...@@ -27,7 +27,7 @@ import com.jmai.sys.mapper.SysUserMapper;
import com.jmai.sys.mapper.SysUserTokenMapper; import com.jmai.sys.mapper.SysUserTokenMapper;
import com.jmai.sys.service.ConfigService; import com.jmai.sys.service.ConfigService;
import com.jmai.sys.service.DictService; import com.jmai.sys.service.DictService;
import com.jmai.sys.service.OrganizationService; import com.jmai.sys.service.DeptService;
import com.jmai.sys.service.UserService; import com.jmai.sys.service.UserService;
import com.jmai.sys.util.PasswordUtil; import com.jmai.sys.util.PasswordUtil;
import lombok.Data; import lombok.Data;
...@@ -65,7 +65,7 @@ public class UserServiceImpl extends AbstractService implements UserService { ...@@ -65,7 +65,7 @@ public class UserServiceImpl extends AbstractService implements UserService {
private SysUserLoginMapper userLoginMapper; private SysUserLoginMapper userLoginMapper;
@Resource @Resource
private OrganizationService organizationService; private DeptService deptService;
@Data @Data
...@@ -119,64 +119,64 @@ public class UserServiceImpl extends AbstractService implements UserService { ...@@ -119,64 +119,64 @@ public class UserServiceImpl extends AbstractService implements UserService {
List<FullUserDto> dtoList = convertTo(userList, this::convertToFullUser); List<FullUserDto> dtoList = convertTo(userList, this::convertToFullUser);
// 填充授权仓库名称 // 填充授权仓库名称
List<Long> organizationIdList = dtoList.stream() List<Long> deptIdList = dtoList.stream()
.flatMap(user -> user.getOrganizationAsList().stream()) .flatMap(user -> user.getDeptAsList().stream())
.filter(ObjectUtil::isNotEmpty) .filter(ObjectUtil::isNotEmpty)
.distinct() .distinct()
.collect(Collectors.toList()); .collect(Collectors.toList());
Map<Long, OrganizationDto> organizationMap = ObjectUtil.isEmpty(organizationIdList) ? Map<Long, DeptDto> deptMap = ObjectUtil.isEmpty(deptIdList) ?
Collections.emptyMap() : Collections.emptyMap() :
organizationService.getOrganizationMap(organizationIdList); deptService.getDeptMap(deptIdList);
dtoList.forEach(dto -> { dtoList.forEach(dto -> {
dto.setOrganizationIdList(extractOrganizationIdList(dto.getAuthOrganizationList(), organizationMap)); dto.setDeptIdList(extractDeptIdList(dto.getAuthDeptList(), deptMap));
dto.setOrganizationNameList(extractOrganizationNameList(dto.getAuthOrganizationList(), organizationMap)); dto.setDeptNameList(extractDeptNameList(dto.getAuthDeptList(), deptMap));
}); });
return dtoList; return dtoList;
} }
private String extractOrganizationIdList(String userOrganizationList, Map<Long, OrganizationDto> organizationMap) { private String extractDeptIdList(String userDeptList, Map<Long, DeptDto> deptMap) {
if (ObjectUtil.isEmpty(userOrganizationList)) { if (ObjectUtil.isEmpty(userDeptList)) {
// 无s授权住址 // 无s授权住址
return ""; return "";
} }
if (ObjectUtil.equals(userOrganizationList, KEY_ALL)) { if (ObjectUtil.equals(userDeptList, KEY_ALL)) {
// 授权全部仓库 // 授权全部仓库
return KEY_NAME_ALL; return KEY_NAME_ALL;
} }
if (ObjectUtil.isEmpty(organizationMap)) { if (ObjectUtil.isEmpty(deptMap)) {
// 未找到仓库 // 未找到仓库
return userOrganizationList; return userDeptList;
} }
return extractLongList(userOrganizationList) return extractLongList(userDeptList)
.stream() .stream()
.filter(organizationMap::containsKey) .filter(deptMap::containsKey)
.map(id -> { .map(id -> {
OrganizationDto organization = organizationMap.get(id); DeptDto dept = deptMap.get(id);
return ObjectUtil.isEmpty(organization) ? "" : organization.getOrganizationId().toString(); return ObjectUtil.isEmpty(dept) ? "" : dept.getDeptId().toString();
}) })
.filter(StrUtil::isNotBlank) .filter(StrUtil::isNotBlank)
.collect(Collectors.joining(",")); .collect(Collectors.joining(","));
} }
private String extractOrganizationNameList(String userOrganizationList, Map<Long, OrganizationDto> organizationMap) { private String extractDeptNameList(String userDeptList, Map<Long, DeptDto> deptMap) {
if (ObjectUtil.isEmpty(userOrganizationList)) { if (ObjectUtil.isEmpty(userDeptList)) {
// 无s授权住址 // 无s授权住址
return ""; return "";
} }
if (ObjectUtil.equals(userOrganizationList, KEY_ALL)) { if (ObjectUtil.equals(userDeptList, KEY_ALL)) {
// 授权全部仓库 // 授权全部仓库
return KEY_NAME_ALL; return KEY_NAME_ALL;
} }
if (ObjectUtil.isEmpty(organizationMap)) { if (ObjectUtil.isEmpty(deptMap)) {
// 未找到仓库 // 未找到仓库
return userOrganizationList; return userDeptList;
} }
return extractLongList(userOrganizationList) return extractLongList(userDeptList)
.stream() .stream()
.filter(organizationMap::containsKey) .filter(deptMap::containsKey)
.map(id -> { .map(id -> {
OrganizationDto organization = organizationMap.get(id); DeptDto dept = deptMap.get(id);
return ObjectUtil.isEmpty(organization) ? "" : organization.getOrganizationName(); return ObjectUtil.isEmpty(dept) ? "" : dept.getDeptName();
}) })
.filter(StrUtil::isNotBlank) .filter(StrUtil::isNotBlank)
.collect(Collectors.joining(",")); .collect(Collectors.joining(","));
...@@ -342,8 +342,8 @@ public class UserServiceImpl extends AbstractService implements UserService { ...@@ -342,8 +342,8 @@ public class UserServiceImpl extends AbstractService implements UserService {
user.setMobile(req.getMobile()); user.setMobile(req.getMobile());
updated = true; updated = true;
} }
if (updated(req.getOrganizationId(), user.getOrganizationId())) { if (updated(req.getDeptId(), user.getDeptId())) {
user.setOrganizationId(req.getOrganizationId()); user.setDeptId(req.getDeptId());
updated = true; updated = true;
} }
...@@ -369,13 +369,13 @@ public class UserServiceImpl extends AbstractService implements UserService { ...@@ -369,13 +369,13 @@ public class UserServiceImpl extends AbstractService implements UserService {
user.setType(newUserType.getCode()); user.setType(newUserType.getCode());
updated = true; updated = true;
} }
if (!CollectionUtil.disjunction(req.getAuthOrganizationAsList(), user.getAuthOrganizationAsList()).isEmpty()) { if (!CollectionUtil.disjunction(req.getAuthDeptAsList(), user.getAuthDeptAsList()).isEmpty()) {
user.setAuthOrganizationList(Optional.ofNullable(req.getAuthOrganizationList()).orElse("")); user.setAuthDeptList(Optional.ofNullable(req.getAuthDeptList()).orElse(""));
updated = true; updated = true;
} }
if (!CollectionUtil.disjunction(req.getRoleAsList(), user.getRoleAsList()).isEmpty()) { if (!CollectionUtil.disjunction(req.getRoleAsList(), user.getRoleAsList()).isEmpty()) {
user.setAuthOrganizationList(Optional.ofNullable(req.getAuthOrganizationList()).orElse("")); user.setAuthDeptList(Optional.ofNullable(req.getAuthDeptList()).orElse(""));
updated = true; updated = true;
} }
......
logs/jmai/root.log
This diff could not be displayed because it is too large.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment