tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip: 字典重构临时提交

Browse Source
This commit is contained in:
ray
2024-10-03 08:05:11 +08:00
parent 48877eaf32
commit 4aaea0ad1e
30 changed files with 626 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/youlai/boot/system/controller/DictController.java
View File

@@ -52,15 +52,6 @@ public class DictController {
return Result.success(list);
}
@Operation(summary = "字典数据项列表")
@GetMapping("/{code}/options")
public Result<List<Option<Long>>> getDictOptions(
@Parameter(description = "字典编码") @PathVariable String code
) {
List<Option<Long>> options = dictService.listDictItemsByCode(code);
return Result.success(options);
}
@Operation(summary = "字典表单")
@GetMapping("/{id}/form")
public Result<DictForm> getDictForm(
@@ -101,4 +92,9 @@ public class DictController {
}
}

96
src/main/java/com/youlai/boot/system/controller/DictDataController.java Normal file
View File

@@ -0,0 +1,96 @@
package com.youlai.boot.system.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.common.annotation.Log;
import com.youlai.boot.common.annotation.RepeatSubmit;
import com.youlai.boot.common.enums.LogModuleEnum;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.common.result.PageResult;
import com.youlai.boot.common.result.Result;
import com.youlai.boot.system.model.form.DictDataForm;
import com.youlai.boot.system.model.query.DictPageQuery;
import com.youlai.boot.system.model.vo.DictDataPageVO;
import com.youlai.boot.system.service.DictDataService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 字典控制层
*
* @author Ray
* @since 2.9.0
*/
@Tag(name = "07.字典数据接口")
@RestController
@RequestMapping("/api/v1/dict-data")
@RequiredArgsConstructor
public class DictDataController {
private final DictDataService dictDataService;
@Operation(summary = "字典数据分页列表")
@GetMapping("/page")
@Log( value = "字典数据分页列表",module = LogModuleEnum.DICT)
public PageResult<DictDataPageVO> getDictDataPage(
DictPageQuery queryParams
) {
Page<DictDataPageVO> result = dictDataService.getDictDataPage(queryParams);
return PageResult.success(result);
}
@Operation(summary = "字典数据表单内")
@GetMapping("/{id}/form")
public Result<DictDataForm> getDictDataForm(
@Parameter(description = "字典数据ID") @PathVariable Long id
) {
DictDataForm formData = dictDataService.getDictDataForm(id);
return Result.success(formData);
}
@Operation(summary = "新增字典数据")
@PostMapping
@PreAuthorize("@ss.hasPerm('sys:dict:add')")
@RepeatSubmit
public Result<Void> saveDictData(@Valid @RequestBody DictDataForm formData) {
boolean result = dictDataService.saveDictData(formData);
return Result.judge(result);
}
@Operation(summary = "修改字典数据")
@PutMapping("/{id}")
@PreAuthorize("@ss.hasPerm('sys:dict:edit')")
public Result<?> updateDictData(
@PathVariable Long id,
@RequestBody DictDataForm formData
) {
boolean status = dictDataService.updateDictData(formData);
return Result.judge(status);
}
@Operation(summary = "删除字典数据")
@DeleteMapping("/{ids}")
@PreAuthorize("@ss.hasPerm('sys:dict:delete')")
public Result<Void> deleteDictionaries(
@Parameter(description = "字典ID，多个以英文逗号(,)拼接") @PathVariable String ids
) {
dictDataService.deleteDictDataByIds(ids);
return Result.success();
}
@Operation(summary = "字典数据列表")
@GetMapping("/{dictCode}/options")
public Result<List<Option>> getDictDataList(
@Parameter(description = "字典编码") @PathVariable String dictCode
) {
List<Option> options = dictDataService.getDictDataList(dictCode);
return Result.success(options);
}
}

9
src/main/java/com/youlai/boot/system/controller/NoticeController.java
View File

@@ -8,7 +8,6 @@ import com.youlai.boot.system.model.query.NoticePageQuery;
import com.youlai.boot.system.model.vo.NoticeDetailVO;
import com.youlai.boot.system.model.vo.NoticePageVO;
import com.youlai.boot.system.model.vo.UserNoticePageVO;
import com.youlai.boot.system.model.vo.UserUnreadNoticeVO;
import com.youlai.boot.system.service.NoticeService;
import com.youlai.boot.system.service.UserNoticeService;
import io.swagger.v3.oas.annotations.Operation;
@@ -20,7 +19,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 通知公告前端控制层
@@ -114,13 +112,6 @@ public class NoticeController {
return Result.judge(result);
}
@Operation(summary = "获取未读的通知公告")
@GetMapping("/unread")
public Result<List<UserUnreadNoticeVO>> listUnreadNotices() {
List<UserUnreadNoticeVO> list = userNoticeService.listUnreadNotices();
return Result.success(list);
}
@Operation(summary = "全部已读")
@PutMapping("/read-all")
public Result<Void> readAll() {

30
src/main/java/com/youlai/boot/system/converter/DictDataConverter.java Normal file
View File

@@ -0,0 +1,30 @@
package com.youlai.boot.system.converter;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.entity.DictData;
import com.youlai.boot.system.model.form.DictDataForm;
import com.youlai.boot.system.model.vo.DictPageVO;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.system.model.form.DictForm;
import org.mapstruct.Mapper;
import java.util.List;
/**
* 字典项 对象转换器
*
* @author Ray
* @since 2022/6/8
*/
@Mapper(componentModel = "spring")
public interface DictDataConverter {
Page<DictPageVO> toPageVo(Page<DictData> page);
DictDataForm toForm(DictData entity);
DictData toEntity(DictDataForm formFata);
Option<Long> toOption(DictData dictData);
List<Option<Long>> toOption(List<DictData> dictData);
}

39
src/main/java/com/youlai/boot/system/converter/DictItemConverter.java
View File

@@ -1,39 +0,0 @@
package com.youlai.boot.system.converter;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.entity.DictItem;
import com.youlai.boot.system.model.vo.DictPageVO;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.system.model.form.DictForm;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import java.util.List;
/**
* 字典项 对象转换器
*
* @author Ray
* @since 2022/6/8
*/
@Mapper(componentModel = "spring")
public interface DictItemConverter {
Page<DictPageVO> toPageVo(Page<DictItem> page);
DictForm toForm(DictItem entity);
DictItem toEntity(DictForm.DictItem dictItems);
List<DictItem> toEntity(List<DictForm.DictItem> dictItems);
DictForm.DictItem toDictItem(DictItem entity);
List<DictForm.DictItem> toDictItem(List<DictItem> entities);
@Mappings({
@Mapping(target = "value", source = "value"),
@Mapping(target = "label", source = "name")
})
Option<Long> toOption(DictItem dictItem);
List<Option<Long>> toOption(List<DictItem> dictItems);
}

24
src/main/java/com/youlai/boot/system/mapper/DictDataMapper.java Normal file
View File

@@ -0,0 +1,24 @@
package com.youlai.boot.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.entity.DictData;
import com.youlai.boot.system.model.query.DictPageQuery;
import com.youlai.boot.system.model.vo.DictDataPageVO;
import org.apache.ibatis.annotations.Mapper;
/**
* 字典数据映射层
*
* @author Ray Hao
* @since 2.9.0
*/
@Mapper
public interface DictDataMapper extends BaseMapper<DictData> {
Page<DictDataPageVO> getDictDataPage(Page<DictDataPageVO> page, DictPageQuery queryParams);
}

20
src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java
View File

@@ -1,20 +0,0 @@
package com.youlai.boot.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.youlai.boot.system.model.entity.DictItem;
import org.apache.ibatis.annotations.Mapper;
/**
* 字典项 访问层
*
* @author Ray Hao
* @since 2.9.0
*/
@Mapper
public interface DictItemMapper extends BaseMapper<DictItem> {
}

9
src/main/java/com/youlai/boot/system/mapper/UserNoticeMapper.java
View File

@@ -7,7 +7,6 @@ import com.youlai.boot.system.model.entity.UserNotice;
import com.youlai.boot.system.model.query.NoticePageQuery;
import com.youlai.boot.system.model.vo.NoticePageVO;
import com.youlai.boot.system.model.vo.UserNoticePageVO;
import com.youlai.boot.system.model.vo.UserUnreadNoticeVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -21,14 +20,6 @@ import java.util.List;
*/
@Mapper
public interface UserNoticeMapper extends BaseMapper<UserNotice> {
/**
* 获取未读的通知公告
* @param userId 用户ID
* @return 公告列表
*/
List<UserUnreadNoticeVO> listUnreadNotices(Long userId);
/**
* 分页获取我的通知公告
* @param page 分页对象

15
src/main/java/com/youlai/boot/system/model/entity/Dict.java
View File

@@ -17,17 +17,18 @@ import lombok.EqualsAndHashCode;
public class Dict extends BaseEntity {
/**
* 类型名称
*/
private String name;
/**
* 类型编码
* 字典编码
*/
private String code;
/**
* 状态(0:正常;1:禁用)
* 字典名称
*/
private String name;
/**
* 状态（1：启用, 0：停用）
*/
private Integer status;

13
src/main/java/com/youlai/boot/system/model/entity/DictItem.java → src/main/java/com/youlai/boot/system/model/entity/DictData.java
View File

@@ -6,17 +6,18 @@ import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableName;
import com.youlai.boot.common.base.BaseEntity;
import lombok.Data;
/**
* 字典项实体
* 字典数据表
*
* @author haoxr
* @since 2022/12/17
*/
@TableName("sys_dict_item")
@TableName("sys_dict_data")
@Data
public class DictItem implements Serializable {
public class DictData extends BaseEntity {
/**
* 主键
*/
@@ -24,14 +25,14 @@ public class DictItem implements Serializable {
private Long id;
/**
* 字典类ID
* 字典编码
*/
private Long dictId;
private String dictCode;
/**
* 字典项名称
*/
private String name;
private String label;
/**
* 字典项值

37
src/main/java/com/youlai/boot/system/model/form/DictDataForm.java Normal file
View File

@@ -0,0 +1,37 @@
package com.youlai.boot.system.model.form;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import org.hibernate.validator.constraints.Range;
import java.util.List;
/**
* 字典数据表单对象
*
* @author Ray Hao
* @since 2.9.0
*/
@Schema(description = "字典数据表单")
@Data
public class DictDataForm {
@Schema(description = "字典ID")
private Long id;
@Schema(description = "字典值")
private String value;
@Schema(description = "字典标签")
private String label;
@Schema(description = "排序")
private Integer sort;
@Schema(description = "状态（1-启用，0-禁用）")
private Integer status;
}

29
src/main/java/com/youlai/boot/system/model/form/DictForm.java
View File

@@ -23,39 +23,14 @@ public class DictForm {
private Long id;
@Schema(description = "字典名称",example = "性别")
private String name;
private String dictName;
@Schema(description = "字典编码", example ="gender")
private String code;
private String dictCode;
@Schema(description = "字典状态（1-启用，0-禁用）", example = "1")
@Range(min = 0, max = 1, message = "字典状态不正确")
private Integer status;
@Schema(description = "字典数据项列表",example = "[{\"id\":1,\"name\":\"男\",\"value\":\"1\",\"sort\":1,\"status\":1},{\"id\":2,\"name\":\"女\",\"value\":\"2\",\"sort\":2,\"status\":1}]")
private List<DictItem> dictItems;
@Schema(description = "字典数据项")
@Getter
@Setter
public static class DictItem {
@Schema(description = "字典ID")
private Long id;
@Schema(description = "字典名称")
private String name;
@Schema(description = "字典值")
private String value;
@Schema(description = "排序")
private Integer sort;
@Schema(description = "状态（1-启用，0-禁用）")
private Integer status;
}
}

20
src/main/java/com/youlai/boot/system/model/query/DictDataPageQuery.java Normal file
View File

@@ -0,0 +1,20 @@
package com.youlai.boot.system.model.query;
import com.youlai.boot.common.base.BasePageQuery;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description ="字典数据分页查询对象")
public class DictDataPageQuery extends BasePageQuery {
@Schema(description="关键字(字典数据标签/值)")
private String keywords;
@Schema(description="字典编码")
private String dictCode;
}

3
src/main/java/com/youlai/boot/system/model/query/DictPageQuery.java
View File

@@ -11,9 +11,10 @@ import lombok.EqualsAndHashCode;
@Schema(description ="字典数据项分页查询对象")
public class DictPageQuery extends BasePageQuery {
@Schema(description="关键字(字典项名称)")
@Schema(description="关键字(字典名称)")
private String keywords;
@Schema(description="字典编码")
private String typeCode;
}

38
src/main/java/com/youlai/boot/system/model/vo/DictDataPageVO.java Normal file
View File

@@ -0,0 +1,38 @@
package com.youlai.boot.system.model.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
/**
* 字典数据项分页VO
*
* @author Ray
* @since 0.0.1
*/
@Schema(description = "字典数据分页对象")
@Getter
@Setter
public class DictDataPageVO {
@Schema(description = "字典数据ID")
private Long id;
@Schema(description = "字典编码")
private String dictCode;
@Schema(description = "字典数据值")
private String value;
@Schema(description = "字典数据标签")
private String label;
@Schema(description = "排序")
private Integer sort;
@Schema(description = "状态（1:启用，0:禁用）")
private Integer status;
}

29
src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java
View File

@@ -23,37 +23,12 @@ public class DictPageVO {
private Long id;
@Schema(description = "字典名称")
private String name;
private String dictName;
@Schema(description = "字典编码")
private String code;
private String dictCode;
@Schema(description = "字典状态（1-启用，0-禁用）")
private Integer status;
@Schema(description = "字典项列表")
private List<DictItem> dictItems;
@Schema(description = "字典")
@Getter
@Setter
public static class DictItem {
@Schema(description = "字典项ID")
private Long id;
@Schema(description = "字典项名称")
private String name;
@Schema(description = "字典项值")
private String value;
@Schema(description = "排序")
private Integer sort;
@Schema(description = "状态（1-启用，0-禁用）")
private Integer status;
}
}

5
src/main/java/com/youlai/boot/system/model/vo/UserNoticePageVO.java
View File

@@ -22,6 +22,9 @@ public class UserNoticePageVO {
@Schema(description = "通知标题")
private String title;
@Schema(description = "通知等级")
private String level;
@Schema(description = "通知类型")
private String typeLabel;
@@ -32,7 +35,7 @@ public class UserNoticePageVO {
private String levelLabel;
@Schema(description = "发布时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private LocalDateTime publishTime;
@Schema(description = "是否已读")

22
src/main/java/com/youlai/boot/system/model/vo/UserUnreadNoticeVO.java
View File

@@ -1,22 +0,0 @@
package com.youlai.boot.system.model.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
* 用户公告VO
*
* @author Theo
* @since 2024-08-28 16:56
*/
@Data
@Schema(description = "用户公告VO")
public class UserUnreadNoticeVO {
@Schema(description = "通知ID")
private Long id;
@Schema(description = "通知标题")
private String title;
}

68
src/main/java/com/youlai/boot/system/service/DictDataService.java Normal file
View File

@@ -0,0 +1,68 @@
package com.youlai.boot.system.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.system.model.entity.DictData;
import com.youlai.boot.system.model.form.DictDataForm;
import com.youlai.boot.system.model.form.DictForm;
import com.youlai.boot.system.model.query.DictPageQuery;
import com.youlai.boot.system.model.vo.DictDataPageVO;
import java.util.List;
/**
* 字典数据接口
*
* @author Ray Hao
* @since 2023/3/4
*/
public interface DictDataService extends IService<DictData> {
/**
* 字典数据分页列表
*
* @param queryParams
* @return
*/
Page<DictDataPageVO> getDictDataPage(DictPageQuery queryParams);
/**
* 获取字典数据表单
*
* @param id 字典数据ID
* @return
*/
DictDataForm getDictDataForm(Long id);
/**
* 保存字典数据
*
* @param formData
* @return
*/
boolean saveDictData(DictDataForm formData);
/**
* 更新字典数据
*
* @param formData 字典数据表单
* @return
*/
boolean updateDictData(DictDataForm formData);
/**
* 删除字典数据
*
* @param ids 字典数据ID,多个逗号分隔
*/
void deleteDictDataByIds(String ids);
/**
* 获取字典数据列表
*
* @param dictCode 字典编码
* @return
*/
List<Option<String>> getDictDataList(String dictCode);
}

14
src/main/java/com/youlai/boot/system/service/DictItemService.java
View File

@@ -1,14 +0,0 @@
package com.youlai.boot.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.youlai.boot.system.model.entity.DictItem;
/**
* 字典项 接口
*
* @author Ray Hao
* @since 2023/3/4
*/
public interface DictItemService extends IService<DictItem> {
}

7
src/main/java/com/youlai/boot/system/service/UserNoticeService.java
View File

@@ -7,7 +7,6 @@ import com.youlai.boot.system.model.entity.UserNotice;
import com.youlai.boot.system.model.query.NoticePageQuery;
import com.youlai.boot.system.model.vo.UserNoticePageVO;
import com.youlai.boot.system.model.vo.NoticePageVO;
import com.youlai.boot.system.model.vo.UserUnreadNoticeVO;
import java.util.List;
@@ -19,12 +18,6 @@ import java.util.List;
*/
public interface UserNoticeService extends IService<UserNotice> {
/**
* 获取未读的通知公告
* @return 公告列表
*/
List<UserUnreadNoticeVO> listUnreadNotices();
/**
* 全部标记为已读
*

112
src/main/java/com/youlai/boot/system/service/impl/DictDataServiceImpl.java Normal file
View File

@@ -0,0 +1,112 @@
package com.youlai.boot.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.system.converter.DictDataConverter;
import com.youlai.boot.system.mapper.DictDataMapper;
import com.youlai.boot.system.model.entity.DictData;
import com.youlai.boot.system.model.form.DictDataForm;
import com.youlai.boot.system.model.query.DictPageQuery;
import com.youlai.boot.system.model.vo.DictDataPageVO;
import com.youlai.boot.system.service.DictDataService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
/**
* 字典数据实现类
*
* @author haoxr
* @since 2022/10/12
*/
@Service
@RequiredArgsConstructor
public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> implements DictDataService {
private final DictDataConverter dictDataConverter;
/**
* 获取字典数据分页列表
*
* @param queryParams
* @return
*/
@Override
public Page<DictDataPageVO> getDictDataPage(DictPageQuery queryParams) {
int pageNum = queryParams.getPageNum();
int pageSize = queryParams.getPageSize();
Page<DictDataPageVO> page = new Page<>(pageNum, pageSize);
return this.baseMapper.getDictDataPage(page, queryParams);
}
/**
* 获取字典数据表单
*
* @param id 字典数据ID
* @return
*/
@Override
public DictDataForm getDictDataForm(Long id) {
DictData entity = this.getById(id);
return dictDataConverter.toForm(entity);
}
/**
* 保存字典数据
*
* @param formData
* @return
*/
@Override
public boolean saveDictData(DictDataForm formData) {
DictData entity = dictDataConverter.toEntity(formData);
return this.save(entity);
}
/**
* 更新字典数据
*
* @param formData 字典数据表单
* @return
*/
@Override
public boolean updateDictData(DictDataForm formData) {
DictData entity = dictDataConverter.toEntity(formData);
return this.updateById(entity);
}
/**
* 删除字典数据
*
* @param ids 字典数据ID集合
*/
@Override
public void deleteDictDataByIds(String ids) {
List<Long> idList = Arrays.stream(ids.split(",")).map(Long::parseLong).toList();
this.removeByIds(idList);
}
/**
* 获取字典数据列表
*
* @param dictCode 字典编码
* @return
*/
@Override
public List<Option<String>> getDictDataList(String dictCode) {
return this.list(new LambdaQueryWrapper<DictData>()
.eq(DictData::getDictCode, dictCode)
.eq(DictData::getStatus, 1)
).stream().map(item -> new Option<>(item.getValue(), item.getLabel()))
.toList();
}
}

24
src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java
View File

@@ -1,24 +0,0 @@
package com.youlai.boot.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.youlai.boot.system.mapper.DictItemMapper;
import com.youlai.boot.system.model.entity.DictItem;
import com.youlai.boot.system.service.DictItemService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
* 数据字典 服务实现类
*
* @author haoxr
* @since 2022/10/12
*/
@Service
@RequiredArgsConstructor
public class DictItemServiceImpl extends ServiceImpl<DictItemMapper, DictItem> implements DictItemService {
}

117
src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java
View File

@@ -6,16 +6,17 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.youlai.boot.common.exception.BusinessException;
import com.youlai.boot.system.converter.DictConverter;
import com.youlai.boot.system.converter.DictItemConverter;
import com.youlai.boot.system.converter.DictDataConverter;
import com.youlai.boot.system.mapper.DictMapper;
import com.youlai.boot.system.model.entity.Dict;
import com.youlai.boot.system.model.entity.DictItem;
import com.youlai.boot.system.model.entity.DictData;
import com.youlai.boot.system.model.form.DictForm;
import com.youlai.boot.system.model.query.DictPageQuery;
import com.youlai.boot.system.model.vo.DictPageVO;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.system.service.DictItemService;
import com.youlai.boot.system.service.DictDataService;
import com.youlai.boot.system.service.DictService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -34,9 +35,9 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements DictService {
private final DictItemService dictItemService;
private final DictDataService dictDataService;
private final DictConverter dictConverter;
private final DictItemConverter dictItemConverter;
private final DictDataConverter dictDataConverter;
/**
* 字典分页列表
@@ -64,20 +65,14 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
Dict entity = dictConverter.toEntity(dictForm);
// 校验 code 是否唯一
String dictCode = entity.getCode();
long count = this.count(new LambdaQueryWrapper<Dict>()
.eq(Dict::getCode, entity.getCode())
.eq(Dict::getCode, dictCode)
);
Assert.isTrue(count == 0, "字典编码已存在");
boolean result = this.save(entity);
// 保存字典项
if (result) {
List<DictForm.DictItem> dictFormDictItems = dictForm.getDictItems();
List<DictItem> dictItems = dictItemConverter.toEntity(dictFormDictItems);
dictItems.forEach(dictItem -> dictItem.setDictId(entity.getId()));
dictItemService.saveBatch(dictItems);
}
return result;
return this.save(entity);
}
@@ -90,17 +85,10 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
public DictForm getDictForm(Long id) {
// 获取字典
Dict entity = this.getById(id);
Assert.isTrue(entity != null, "字典不存在");
DictForm dictForm = dictConverter.toForm(entity);
// 获取字典项集合
List<DictItem> dictItems = dictItemService.list(new LambdaQueryWrapper<DictItem>()
.eq(DictItem::getDictId, id)
);
// 转换数据项
List<DictForm.DictItem> dictItemList = dictItemConverter.toDictItem(dictItems);
dictForm.setDictItems(dictItemList);
return dictForm;
if(entity==null){
throw new BusinessException("字典不存在");
}
return dictConverter.toForm(entity);
}
/**
@@ -115,57 +103,16 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
Dict entity = dictConverter.toEntity(dictForm);
// 校验 code 是否唯一
String dictCode = entity.getCode();
long count = this.count(new LambdaQueryWrapper<Dict>()
.eq(Dict::getCode, entity.getCode())
.eq(Dict::getCode, dictCode)
.ne(Dict::getId, id)
);
Assert.isTrue(count == 0, "字典编码已存在");
boolean result = this.updateById(entity);
if (result) {
// 更新字典项
List<DictForm.DictItem> dictFormDictItems = dictForm.getDictItems();
List<DictItem> dictItems = dictItemConverter.toEntity(dictFormDictItems);
// 获取当前数据库中的字典项
List<DictItem> currentDictItemEntities = dictItemService.list(new LambdaQueryWrapper<DictItem>()
.eq(DictItem::getDictId, id)
);
// 获取当前数据库中存在的字典项ID集合
Set<Long> currentDictItemIds = currentDictItemEntities.stream()
.map(DictItem::getId)
.collect(Collectors.toSet());
// 获取新提交的字典项ID集合
Set<Long> newAttrIds = dictItems.stream()
.map(DictItem::getId)
.filter(Objects::nonNull)
.collect(Collectors.toSet());
// 需要删除的字典项ID集合（存在于数据库但不在新提交的字典项中）
Set<Long> idsToDelete = new HashSet<>(currentDictItemIds);
idsToDelete.removeAll(newAttrIds);
// 删除不在新提交字典项中的旧字典项
if (!idsToDelete.isEmpty()) {
dictItemService.removeByIds(idsToDelete);
}
// 更新或新增字典项
for (DictItem dictItem : dictItems) {
if (dictItem.getId() != null && currentDictItemIds.contains(dictItem.getId())) {
// 更新现有字典项
dictItemService.updateById(dictItem);
} else {
// 新增字典项
dictItem.setDictId(id);
dictItemService.save(dictItem);
}
}
if(count>0){
throw new BusinessException("字典编码已存在");
}
return result;
return this.updateById(entity);
}
/**
@@ -183,13 +130,17 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
.toList();
for (String id : idList) {
boolean result = this.removeById(id);
if (result) {
Dict dict = this.getById(id);
if (dict != null) {
boolean removeResult = this.removeById(id);
// 删除字典下的字典项
dictItemService.remove(
new LambdaQueryWrapper<DictItem>()
.eq(DictItem::getDictId, id)
);
if (removeResult) {
dictDataService.remove(
new LambdaQueryWrapper<DictData>()
.eq(DictData::getDictCode, dict.getCode())
);
}
}
}
}
@@ -213,13 +164,13 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
}
// 获取字典项
List<DictItem> dictItems = dictItemService.list(
new LambdaQueryWrapper<DictItem>()
.eq(DictItem::getDictId, dict.getId())
List<DictData> dictData = dictDataService.list(
new LambdaQueryWrapper<DictData>()
.eq(DictData::getDictCode, dict.getCode())
);
// 转换为 Option
return dictItemConverter.toOption(dictItems);
return dictDataConverter.toOption(dictData);
}
/**

13
src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java
View File

@@ -10,7 +10,6 @@ import com.youlai.boot.system.model.entity.UserNotice;
import com.youlai.boot.system.model.query.NoticePageQuery;
import com.youlai.boot.system.model.vo.NoticePageVO;
import com.youlai.boot.system.model.vo.UserNoticePageVO;
import com.youlai.boot.system.model.vo.UserUnreadNoticeVO;
import com.youlai.boot.system.service.UserNoticeService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -29,18 +28,6 @@ public class UserNoticeServiceImpl extends ServiceImpl<UserNoticeMapper, UserNot
private final UserNoticeMapper userNoticeMapper;
/**
* 获取未读的通知公告
*
* @return 公告列表
*/
@Override
public List<UserUnreadNoticeVO> listUnreadNotices() {
//获取当前登录用户
Long userId = SecurityUtils.getUserId();
return userNoticeMapper.listUnreadNotices(userId);
}
/**
* 全部标记为已读
*