接入日志

authorize-api-service/src/main/java/com/xy/entity/SysDict.java

@@ -1,49 +0,0 @@
-package com.xy.entity;
-
-import com.xy.base.BaseEntity2;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 字典表
- * </p>
- *
- * @author 谭斌
- * @since 2022-12-16
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "SysDict对象", description = "字典表")
-public class SysDict extends BaseEntity2<SysDict> implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("标识")
-    private String dictKey;
-
-    @ApiModelProperty("描述")
-    private String description;
- 
-    @ApiModelProperty("是否是系统内置")
-    private Boolean systemFlag;
-
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty("创建人")
-    private Long createUser;
-
-    @ApiModelProperty("更新人")
-    private Long updateUser;
-
-    @ApiModelProperty("更新时间")
-    private LocalDateTime updateTime;
-
-
-}

authorize-api-service/src/main/java/com/xy/entity/SysDictItem.java

@@ -1,62 +0,0 @@
-package com.xy.entity;
-
-import com.xy.base.BaseEntity2;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 字典项
- * </p>
- *
- * @author 谭斌
- * @since 2022-12-16
- */
-@Data
-@Accessors(chain = true)
-@ApiModel(value = "SysDictItem对象", description = "字典项")
-public class SysDictItem extends BaseEntity2<SysDictItem> implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("字典ID")
-    private Long dictId;
-
-    @ApiModelProperty("字典标识")
-    private String dictKey;
-
-    @ApiModelProperty("值")
-    private String value;
-
-    @ApiModelProperty("标签")
-    private String label;
-
-    @ApiModelProperty("描述")
-    private String description;
-
-    @ApiModelProperty("排序（升序）")
-    private Integer sortOrder;
-
-    @ApiModelProperty("是否启用 true启用，false")
-    private Boolean enable;
-
-
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty("创建人")
-    private Long createUser;
-
-    @ApiModelProperty("修改人")
-    private Long updateUser;
-
-    @ApiModelProperty("更新时间")
-    private LocalDateTime updateTime;
-
-
-}

authorize-api-service/src/main/java/com/xy/mapper/SysDictItemMapper.java

@@ -1,16 +0,0 @@
-package com.xy.mapper;
-
-import com.xy.entity.SysDictItem;
-import icu.mhb.mybatisplus.plugln.base.mapper.JoinBaseMapper;
-
-/**
- * <p>
- * 字典项 Mapper 接口
- * </p>
- *
- * @author 谭斌
- * @since 2022-12-16
- */
-public interface SysDictItemMapper extends JoinBaseMapper<SysDictItem> {
-
-}

authorize-api-service/src/main/java/com/xy/mapper/SysDictMapper.java

@@ -1,16 +0,0 @@
-package com.xy.mapper;
-
-import com.xy.entity.SysDict;
-import icu.mhb.mybatisplus.plugln.base.mapper.JoinBaseMapper;
-
-/**
- * <p>
- * 字典表 Mapper 接口
- * </p>
- *
- * @author 谭斌
- * @since 2022-12-16
- */
-public interface SysDictMapper extends JoinBaseMapper<SysDict> {
-
-}

authorize-api-service/src/main/java/com/xy/service/SysApiServiceImpl.java

@@ -1,109 +0,0 @@
-package com.xy.service;
-
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.xy.dto.SysDict.SysDictDto;
-import com.xy.dto.SysDict.SysDictItemDto;
-import com.xy.dto.SysDict.SysDictItemPageDto;
-import com.xy.dto.SysDict.SysDictPageDto;
-import com.xy.entity.SysDict;
-import com.xy.entity.SysDictItem;
-import com.xy.utils.Beans;
-import com.xy.utils.PageBean;
-import com.xy.utils.R;
-import com.xy.vo.SysDictItemVo;
-import com.xy.vo.SysDictVo;
-import io.swagger.annotations.Api;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-import static com.xy.utils.Beans.copy;
-import static com.xy.utils.PlusBeans.toIPage;
-import static com.xy.utils.PlusBeans.toPageBean;
-
-@Service
-@RequiredArgsConstructor
-@Api(tags = "字典表管理API")
-public class SysApiServiceImpl implements SysDicApiService {
-
-
-    private final SysDictItemService sysDictItemService;
-
-    private final SysDictService sysDictService;
-
-    @Override
-    public R<SysDictVo> getById(Long id) {
-        return R.ok(Beans.copy(SysDictVo.class, sysDictItemService.getById(id)));
-    }
-
-
-    @Override
-    public R<PageBean<SysDictVo>> getDictPage(SysDictPageDto dto) {
-        PageBean pageBean = dto.getPage();
-        IPage page = sysDictService.page(toIPage(pageBean), Wrappers.<com.xy.entity.SysDict>lambdaQuery()
-                .like(StrUtil.isNotBlank(dto.getDictKey()), com.xy.entity.SysDict::getDictKey, dto.getDictKey()));
-        return R.ok(toPageBean(SysDictVo.class, page));
-    }
-
-    @Override
-    public R<List<SysDictItemVo>> getDictByKey(String key) {
-        List<SysDictItem> sysDictItemList = sysDictItemService.list(Wrappers.<SysDictItem>lambdaQuery().eq(SysDictItem::getDictKey, key));
-        return R.ok(copy(SysDictItemVo.class, sysDictItemList));
-    }
-
-    @Override
-    public R<Boolean> add(SysDictDto sysDictDto) {
-        return R.ok(sysDictService.save(copy(SysDict.class, sysDictDto)));
-    }
-
-    @Override
-    public R<Boolean> removeById(Long id) {
-        sysDictService.removeDict(id);
-        return R.ok();
-    }
-
-    @Override
-    public R<Boolean> updateSysDictById(SysDictDto sysDictDto) {
-        sysDictService.updateDict(copy(com.xy.entity.SysDict.class, sysDictDto));
-        return R.ok();
-    }
-
-    @Override
-    public R<PageBean<SysDictItemVo>> getSysDictItemPage(SysDictItemPageDto pageDto) {
-        PageBean pageBean = pageDto.getPage();
-        SysDictItem sysDictItem = copy(SysDictItem.class, pageDto);
-        IPage page = sysDictItemService.page(toIPage(pageBean), Wrappers.query(sysDictItem));
-        return R.ok(toPageBean(SysDictItemVo.class, page));
-    }
-
-    @Override
-    public R<SysDictItemVo> getDictItemById(Long id) {
-        return R.ok(copy(SysDictItemVo.class, sysDictItemService.getById(id)));
-    }
-
-    @Override
-    public R<Boolean> addItem(SysDictItemDto sysDictItemDto) {
-        return R.ok(sysDictItemService.save(copy(SysDictItem.class, sysDictItemDto)));
-    }
-
-    @Override
-    public R<Boolean> updateSysDictItemById(SysDictItemDto sysDictItemDto) {
-        sysDictItemService.updateDictItem(copy(SysDictItem.class, sysDictItemDto));
-        return R.ok();
-    }
-
-    @Override
-    public R<Boolean> removeDictItemById(Long id) {
-        sysDictItemService.removeDictItem(id);
-        return R.ok();
-    }
-
-    @Override
-    public R<Boolean> clearDictCache() {
-        sysDictService.clearDictCache();
-        return R.ok();
-    }
-}

authorize-api-service/src/main/java/com/xy/service/SysDictItemService.java

@@ -1,32 +0,0 @@
-package com.xy.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.xy.entity.SysDictItem;
-
-/**
- * <p>
- * 字典项 服务类
- * </p>
- *
- * @author 谭斌
- * @since 2022-12-16
- */
-public interface SysDictItemService extends IService<SysDictItem> {
-    /**
-     * 删除字典项
-     *
-     * @param id 字典项ID
-     * @return
-     */
-    void removeDictItem(Long id);
-
-    /**
-     * 更新字典项
-     *
-     * @param item 字典项
-     * @return
-     */
-    void updateDictItem(SysDictItem item);
-    
-
-}

authorize-api-service/src/main/java/com/xy/service/SysDictService.java

@@ -1,37 +0,0 @@
-package com.xy.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.xy.entity.SysDict;
-
-/**
- * <p>
- * 字典表 服务类
- * </p>
- *
- * @author 谭斌
- * @since 2022-12-16
- */
-public interface SysDictService extends IService<SysDict> {
-
-
-    /**
-     * 根据ID 删除字典
-     *
-     * @param id
-     * @return
-     */
-    void removeDict(Long id);
-
-    /**
-     * 更新字典
-     *
-     * @param sysDict 字典
-     * @return
-     */
-    void updateDict(SysDict sysDict);
-
-    /**
-     * 清除缓存
-     */
-    void clearDictCache();
-}

authorize-api-service/src/main/java/com/xy/service/impl/SysDictItemServiceImpl.java

@@ -1,64 +0,0 @@
-package com.xy.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xy.constants.CacheConstants;
-import com.xy.entity.SysDict;
-import com.xy.entity.SysDictItem;
-import com.xy.enums.DictTypeEnum;
-import com.xy.mapper.SysDictItemMapper;
-import com.xy.service.SysDictItemService;
-import com.xy.service.SysDictService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.stereotype.Service;
-import org.springframework.util.Assert;
-
-/**
- * <p>
- * 字典项 服务实现类
- * </p>
- *
- * @author 谭斌
- * @since 2022-12-16
- */
-@Service
-@RequiredArgsConstructor
-public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDictItem> implements SysDictItemService {
-
-    private final SysDictService dictService;
-
-    /**
-     * 删除字典项
-     *
-     * @param id 字典项ID
-     * @return
-     */
-    @Override
-    @CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true)
-    public void removeDictItem(Long id) {
-        // 根据ID查询字典ID
-        SysDictItem dictItem = getById(id);
-        SysDict dict = dictService.getById(dictItem.getDictId());
-        // 系统内置
-        Assert.state(!DictTypeEnum.SYSTEM.getType().equals(dict.getSystemFlag()),
-                "系统内置字典不能删除");
-        removeById(id);
-    }
-
-    /**
-     * 更新字典项
-     *
-     * @param item 字典项
-     * @return
-     */
-    @Override
-    @CacheEvict(value = CacheConstants.DICT_DETAILS, key = "#item.type")
-    public void updateDictItem(SysDictItem item) {
-        // 查询字典
-        SysDict dict = dictService.getById(item.getDictId());
-        // 系统内置
-        Assert.state(!DictTypeEnum.SYSTEM.getType().equals(dict.getSystemFlag()),
-                "系统内置字典不能修改");
-        this.updateById(item);
-    }
-}

authorize-api-service/src/main/java/com/xy/service/impl/SysDictServiceImpl.java

@@ -1,71 +0,0 @@
-package com.xy.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xy.constants.CacheConstants;
-import com.xy.entity.SysDict;
-import com.xy.entity.SysDictItem;
-import com.xy.enums.DictTypeEnum;
-import com.xy.mapper.SysDictItemMapper;
-import com.xy.mapper.SysDictMapper;
-import com.xy.service.SysDictService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-
-/**
- * <p>
- * 字典表 服务实现类
- * </p>
- *
- * @author 谭斌
- * @since 2022-12-16
- */
-@Service
-@RequiredArgsConstructor
-public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements SysDictService {
-
-    private final SysDictItemMapper dictItemMapper;
-
-    /**
-     * 根据ID 删除字典
-     *
-     * @param id 字典ID
-     * @return
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    @CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true)
-    public void removeDict(Long id) {
-        SysDict dict = getById(id);
-        // 系统内置
-        Assert.state(!DictTypeEnum.SYSTEM.getType().equals(dict.getSystemFlag()),
-                "系统内置字典不能删除");
-        baseMapper.deleteById(id);
-        dictItemMapper.delete(Wrappers.<SysDictItem>lambdaQuery().eq(SysDictItem::getDictId, id));
-    }
-
-    /**
-     * 更新字典
-     *
-     * @param dict 字典
-     * @return
-     */
-    @Override
-    @CacheEvict(value = CacheConstants.DICT_DETAILS, key = "#dict.type")
-    public void updateDict(SysDict dict) {
-        SysDict sysDict = getById(dict.getId());
-        // 系统内置
-        Assert.state(!DictTypeEnum.SYSTEM.getType().equals(sysDict.getSystemFlag()),
-                "系统内置字典不能修改");
-        this.updateById(dict);
-    }
-
-    @Override
-    @CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true)
-    public void clearDictCache() {
-
-    }
-}

authorize-api-service/src/main/java/com/xy/service/impl/SysWorkUserServiceImpl.java

@@ -4,24 +4,21 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.crypto.SecureUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xy.collections.list.JArrayList;
+import com.xy.collections.list.JList;
+import com.xy.collections.map.JHashMap;
+import com.xy.collections.map.JMap;
 import com.xy.dto.SysWorkUser.*;
-import com.xy.entity.SysUserDept;
-import com.xy.entity.SysUserRole;
-import com.xy.entity.SysWorkUser;
-import com.xy.mapper.SysUserDeptMapper;
-import com.xy.mapper.SysUserRoleMapper;
-import com.xy.mapper.SysWorkUserMapper;
+import com.xy.entity.*;
+import com.xy.mapper.*;
 import com.xy.redis.RedisCache;
 import com.xy.service.SysUserDeptService;
 import com.xy.service.SysUserRoleService;
 import com.xy.service.SysWorkUserService;
 import com.xy.utils.Beans;
-import com.xy.utils.Emptys;
-import com.xy.utils.PageBean;
 import com.xy.utils.R;
 import icu.mhb.mybatisplus.plugln.core.JoinLambdaWrapper;
 import io.swagger.annotations.Api;
@@ -33,12 +30,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static com.xy.utils.PlusBeans.toIPage;
-import static com.xy.utils.PlusBeans.toPageBean;
-
 
 /**
  * <p>
@@ -54,12 +49,17 @@ import static com.xy.utils.PlusBeans.toPageBean;
 public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWorkUser> implements SysWorkUserService {
 
     private final SysUserRoleService sysUserRoleService;
+
     private final SysUserDeptService sysUserDeptService;
 
     private final SysUserRoleMapper sysUserRoleMapper;
 
     private final SysUserDeptMapper sysUserDeptMapper;
 
+    private final SysRoleMapper sysRoleMapper;
+
+    private final SysDeptMapper sysDeptMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R<Long> register(AddDto addDto) {
@@ -191,43 +191,62 @@ public class SysWorkUserServiceImpl extends ServiceImpl<SysWorkUserMapper, SysWo
         return R.ok();
     }
 
-    @ApiOperation("分页查询")
-    @PostMapping("page")
-    public R<PageBean<SysWorkVo>> page(@RequestBody PageDto pageDto) {
+    @ApiOperation("集合查询")
+    @PostMapping("list")
+    public R<List<SysWorkVo>> list(@RequestBody ListDto listDto) {
         //条件构造
         JoinLambdaWrapper<SysWorkUser> joinLambdaWrapper = new JoinLambdaWrapper<>(SysWorkUser.class)
-                .eq(pageDto.getId() != null, SysWorkUser::getId, pageDto.getId())
-                .like(StringUtils.isNotEmpty(pageDto.getAccount()), SysWorkUser::getAccount, pageDto.getAccount())
-                .like(StringUtils.isNotEmpty(pageDto.getEmail()), SysWorkUser::getEmail, pageDto.getEmail())
-                .like(StringUtils.isNotEmpty(pageDto.getPhone()), SysWorkUser::getPhone, pageDto.getPhone())
-                .like(pageDto.getStatus() != null, SysWorkUser::getStatus, pageDto.getStatus())
-                .ge(pageDto.getBeginCreateTime() != null, SysWorkUser::getCreateTime, pageDto.getBeginCreateTime())
-                .le(pageDto.getEndCreateTime() != null, SysWorkUser::getCreateTime, pageDto.getEndCreateTime())
+                .in(SysWorkUser::getId, listDto.getId())
                 .leftJoin(SysUserRole.class, SysUserRole::getWorkUserId, SysWorkUser::getId)
-                .eq(pageDto.getRoleId() != null, SysUserRole::getRoleId, pageDto.getRoleId())
-                .eq(pageDto.getSysId() != null, SysUserRole::getSysId, pageDto.getSysId())
                 .manyToManySelect(SysWorkVo::getRoleIds, Long.class, cb -> cb.add(SysUserRole::getRoleId))
                 .end()
                 .leftJoin(SysUserDept.class, SysUserDept::getWorkUserId, SysWorkUser::getId)
-                .eq(pageDto.getDeptId() != null, SysUserDept::getDeptId, pageDto.getDeptId())
                 .manyToManySelect(SysWorkVo::getDeptIds, Long.class, cb -> cb.add(SysUserDept::getDeptId))
                 .end();
-        PageBean page = pageDto.getPage();
-        if (!Emptys.check(page.getOrders())) {
-            joinLambdaWrapper.orderByDesc(SysWorkUser::getCreateTime);
-        }
         //查询数据
-        IPage<SysWorkVo> sysWorkUserIPage = baseMapper.joinSelectPage(toIPage(page), joinLambdaWrapper, SysWorkVo.class);
-        List<SysWorkVo> records = sysWorkUserIPage.getRecords();
-        records.forEach(sysWorkVo -> sysWorkVo.setPassword(null));
-        return R.ok(toPageBean(sysWorkUserIPage));
-    }
-
-    @ApiOperation("根据创建人分页查询")
-    @PostMapping("pageByCreateUser")
-    public R<PageBean<SysWorkVo>> pageByCreateUser(@RequestBody PageDto pageDto) {
-        Long loginId = RedisCache.getLoginId(Long.class);
-        pageDto.setCreateUser(loginId);
-        return page(pageDto);
+        List<SysWorkVo> sysWorkVos = baseMapper.joinSelectList(joinLambdaWrapper, SysWorkVo.class);
+        if (sysWorkVos.size() > 0) {
+            //查询角色信息
+            JList<List<Long>> roleIdss = new JArrayList<>(sysWorkVos).getProperty(SysWorkVo::getRoleIds);
+            List<Long> roleIds = new ArrayList<>();
+            roleIdss.forEach(longs -> roleIds.addAll(longs));
+            JMap<Long, SysRole> sysRoleJMap = new JHashMap<>();
+            if (roleIds.size() > 0) {
+                List<SysRole> sysRoles = sysRoleMapper.selectList(new LambdaQueryWrapper<SysRole>().in(SysRole::getId, roleIds));
+                sysRoleJMap = new JArrayList<>(sysRoles).toMap(SysRole::getId).cover();
+            }
+            //查询部门信息
+            JList<List<Long>> deptIdss = new JArrayList<>(sysWorkVos).getProperty(SysWorkVo::getDeptIds);
+            List<Long> deptIds = new ArrayList<>();
+            deptIdss.forEach(longs -> deptIds.addAll(longs));
+            JMap<Long, SysDept> sysDeptJMap = new JHashMap<>();
+            if (deptIds.size() > 0) {
+                List<SysDept> sysDepts = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>().in(SysDept::getId, deptIds));
+                sysDeptJMap = new JArrayList<>(sysDepts).toMap(SysDept::getId).cover();
+            }
+            //处理结果值
+            for (SysWorkVo sysWorkVo : sysWorkVos) {
+                List<Long> workVoRoleIds = sysWorkVo.getRoleIds();
+                sysWorkVo.setRoleNames(new ArrayList<>());
+                for (Long workVoRoleId : workVoRoleIds) {
+                    SysRole sysRole = sysRoleJMap.get(workVoRoleId);
+                    if (sysRole == null) {
+                        break;
+                    }
+                    sysWorkVo.getRoleNames().add(sysRole.getName());
+                }
+                List<Long> workVoDeptIds = sysWorkVo.getDeptIds();
+                sysWorkVo.setDeptNames(new ArrayList<>());
+                for (Long workVoDeptId : workVoDeptIds) {
+                    SysDept sysDept = sysDeptJMap.get(workVoDeptId);
+                    if (sysDept == null) {
+                        break;
+                    }
+                    sysWorkVo.getDeptNames().add(sysDept.getName());
+                }
+            }
+        }
+        sysWorkVos.forEach(sysWorkVo -> sysWorkVo.setPassword(null));
+        return R.ok(sysWorkVos);
     }
 }

authorize-api/src/main/java/com/xy/dto/SysDict/SysDictDto.java

@@ -1,46 +0,0 @@
-package com.xy.dto.SysDict;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xy.vo.BaseVo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 字典类型
- * </p>
- *
- * @author 谭斌
- * @since 2022-12-16
- */
-@Data
-@Accessors(chain = true)
-@ApiModel("字典类型")
-public class SysDictDto extends BaseVo {
-
-
-    @ApiModelProperty("ID")
-    private Long id;
-
-    @ApiModelProperty("标识")
-    private String dictKey;
-
-    @ApiModelProperty("描述")
-    private String description;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("是否是系统内置")
-    private Boolean systemFlag;
-    @ApiModelProperty("创建人")
-    private Long createUser;
-
-    @ApiModelProperty("更新人")
-    private Long updateUser;
-
-}

authorize-api/src/main/java/com/xy/dto/SysDict/SysDictItemDto.java

@@ -1,66 +0,0 @@
-package com.xy.dto.SysDict;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 字典项
- * </p>
- *
- * @author 谭斌
- * @since 2022-12-16
- */
-@Data
-@Accessors(chain = true)
-@ApiModel("字典项")
-public class SysDictItemDto {
-
-    @ApiModelProperty("ID")
-    private Long id;
-
-    @ApiModelProperty("字典ID")
-    private Long dictId;
-
-    @ApiModelProperty("字典标识")
-    private String dictKey;
-
-    @ApiModelProperty("值")
-    private String value;
-
-    @ApiModelProperty("标签")
-    private String label;
-    
-    @ApiModelProperty("是否启用 true启用，false")
-    private Boolean enable;
-
-    @ApiModelProperty("描述")
-    private String description;
-
-    @ApiModelProperty("排序（升序）")
-    private Integer sortOrder;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty("创建人")
-    private Long createUser;
-
-    @ApiModelProperty("修改人")
-    private Long updateUser;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty("更新时间")
-    private LocalDateTime updateTime;
-
-
-}

authorize-api/src/main/java/com/xy/dto/SysDict/SysDictItemPageDto.java

@@ -1,42 +0,0 @@
-package com.xy.dto.SysDict;
-
-import com.xy.utils.PageBean;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 字典项
- * </p>
- *
- * @author 谭斌
- * @since 2022-12-16
- */
-@Data
-@Accessors(chain = true)
-@ApiModel("字典项")
-public class SysDictItemPageDto {
-
-    @ApiModelProperty("分页对象")
-    private PageBean page;
-
-    @ApiModelProperty("字典ID")
-    private Long dictId;
-
-    @ApiModelProperty("字典标识")
-    private String dictKey;
-
-    @ApiModelProperty("值")
-    private String value;
-
-    @ApiModelProperty("标签")
-    private String label;
-
- 
-    @ApiModelProperty("描述")
-    private String description;
-
-
-}

authorize-api/src/main/java/com/xy/dto/SysDict/SysDictPageDto.java

@@ -1,30 +0,0 @@
-package com.xy.dto.SysDict;
-
-import com.xy.utils.PageBean;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-@Data
-@ApiModel("数据字典类型分页请求")
-@Accessors(chain = true)
-public class SysDictPageDto {
-
-
-    @ApiModelProperty("分页对象")
-    private PageBean page;
-
-  
-    @ApiModelProperty("标识")
-    private String dictKey;
-
-    @ApiModelProperty("描述")
-    private String description;
-
-
-    @ApiModelProperty("是否是系统内置")
-    private Boolean systemFlag;
-
-
-}

authorize-api/src/main/java/com/xy/dto/SysWorkUser/ListDto.java

@@ -0,0 +1,20 @@
+package com.xy.dto.SysWorkUser;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Data
+@ApiModel
+@Accessors(chain = true)
+public class ListDto {
+
+    @NotEmpty(message = "id不能为空")
+    @ApiModelProperty(value = "用户ID")
+    private List<Long> id;
+
+}

authorize-api/src/main/java/com/xy/dto/SysWorkUser/PageDto.java

@@ -1,64 +0,0 @@
-package com.xy.dto.SysWorkUser;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xy.utils.PageBean;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-@Data
-@ApiModel("业务用户分页请求")
-@Accessors(chain = true)
-public class PageDto {
-
-    @ApiModelProperty("分页对象")
-    private PageBean page;
-
-    @ApiModelProperty(value = "用户ID")
-    private Long id;
-
-    @ApiModelProperty(value = "系统ID")
-    private Long sysId;
-
-    @ApiModelProperty(value = "账号")
-    private String account;
-
-    @ApiModelProperty(value = "邮箱")
-    private String email;
-
-    @ApiModelProperty(value = "手机")
-    private String phone;
-
-    @ApiModelProperty(value = "状态")
-    private Boolean status;
-
-    @ApiModelProperty(value = "角色ID")
-    private Long roleId;
-
-    @ApiModelProperty(value = "部门ID")
-    private Long deptId;
-
-    @ApiModelProperty(value = "创建人")
-    private Long createUser;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "创建时间-起")
-    private LocalDate beginCreateTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "创建时间-始")
-    private LocalDate endCreateTime;
-
-    public LocalDateTime getBeginCreateTime() {
-        return beginCreateTime == null ? null : beginCreateTime.atTime(0, 0, 0);
-    }
-
-    public LocalDateTime getEndCreateTime() {
-        return endCreateTime == null ? null : endCreateTime.atTime(23, 59, 59);
-    }
-
-}

authorize-api/src/main/java/com/xy/dto/SysWorkUser/SysWorkVo.java

@@ -51,7 +51,15 @@ public class SysWorkVo {
     @ApiModelProperty("更新人")
     private Long updateUser;
 
+    @ApiModelProperty("角色id")
     private List<Long> roleIds;
 
+    @ApiModelProperty("角色名称")
+    private List<String> roleNames;
+
+    @ApiModelProperty("部门id")
     private List<Long> deptIds;
+
+    @ApiModelProperty("部门名称")
+    private List<String> deptNames;
 }

authorize-api/src/main/java/com/xy/service/SysDicApiService.java

@@ -1,91 +0,0 @@
-package com.xy.service;
-
-import com.xy.annotate.RestMappingController;
-import com.xy.constants.CacheConstants;
-import com.xy.dto.SysDict.SysDictDto;
-import com.xy.dto.SysDict.SysDictItemDto;
-import com.xy.dto.SysDict.SysDictItemPageDto;
-import com.xy.dto.SysDict.SysDictPageDto;
-import com.xy.utils.PageBean;
-import com.xy.utils.R;
-import com.xy.vo.SysDictItemVo;
-import com.xy.vo.SysDictVo;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/***
- * 字典表管理
- * @author 谭斌
- * @date 2022/12/16 13:56
- */
-@RestMappingController("dict")
-public interface SysDicApiService {
-
-
-    @ApiOperation("通过ID查询字典信息")
-    @GetMapping("{id}")
-    R<SysDictVo> getById(@PathVariable("id") Long id);
-
-
-    @ApiOperation("分页查询字典信息")
-    @GetMapping("page")
-    R<PageBean<SysDictVo>> getDictPage(SysDictPageDto page);
-
-
-    @ApiOperation("通过字典类型查找字典")
-    @GetMapping("key/{key}")
-    @Cacheable(value = CacheConstants.DICT_DETAILS, key = "#key")
-    R<List<SysDictItemVo>> getDictByKey(@PathVariable String key);
-
-
-    @ApiOperation("添加字典")
-    @PostMapping("add")
-    R<Boolean> add(@Valid @RequestBody SysDictDto sysDict);
-
-
-    @ApiOperation("删除字典，并且清除字典缓存")
-    @DeleteMapping("{id}")
-    R<Boolean> removeById(@PathVariable("id") Long id);
-
-
-    @ApiOperation("修改字典")
-    @PostMapping("update")
-    R<Boolean> updateSysDictById(@Valid @RequestBody SysDictDto sysDict);
-
-
-    @ApiOperation("分页查询字典项")
-    @GetMapping("item/page")
-    R<PageBean<SysDictItemVo>> getSysDictItemPage(SysDictItemPageDto pageDto);
-
-
-    @ApiOperation("通过id查询字典项")
-    @GetMapping("item/{id}")
-    R<SysDictItemVo> getDictItemById(@PathVariable("id") Long id);
-
-
-    @ApiOperation("新增字典项")
-    @PostMapping("addItem")
-    @CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true)
-    R<Boolean> addItem(@RequestBody SysDictItemDto sysDictItem);
-
-
-    @ApiOperation("修改字典项")
-    @PostMapping("updateItem")
-    R<Boolean> updateSysDictItemById(@RequestBody SysDictItemDto sysDictItem);
-
-
-    @ApiOperation("通过id删除字典项")
-    @DeleteMapping("item/{id}")
-    R<Boolean> removeDictItemById(@PathVariable("id") Long id);
-
-
-    @ApiOperation("清除字典缓存")
-    @DeleteMapping("/cache")
-    R<Boolean> clearDictCache();
-
-}