From adbb9f1dfa02deddd34dd32e0ebf46a341bff3a4 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Thu, 21 Dec 2023 10:24:00 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat(icon=5Fmanage):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=92=8C=E5=9B=BE=E6=A0=87=E7=BB=84=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/icon/annotation/IsJsonString.java | 38 +++++ .../icon/controller/IconDetailController.java | 83 ++++++++++ .../icon/controller/IconGroupController.java | 84 ++++++++++ .../oss/client/icon/entity/IconDetail.java | 99 ++++++++++++ .../oss/client/icon/entity/IconGroup.java | 73 +++++++++ .../client/icon/mapper/IconDetailMapper.java | 16 ++ .../client/icon/mapper/IconGroupMapper.java | 16 ++ .../cn/axzo/oss/client/icon/package-info.java | 8 + .../icon/repository/IconDetailRepository.java | 16 ++ .../icon/repository/IconGroupRepository.java | 15 ++ .../icon/service/IconDetailService.java | 50 ++++++ .../client/icon/service/IconGroupService.java | 48 ++++++ .../service/impl/IconDetailServiceImpl.java | 145 ++++++++++++++++++ .../service/impl/IconGroupServiceImpl.java | 124 +++++++++++++++ .../icon/validator/JsonStringValidator.java | 37 +++++ .../icon/vo/request/IconDetailAddReq.java | 71 +++++++++ .../icon/vo/request/IconDetailListReq.java | 40 +++++ .../icon/vo/request/IconDetailUpdateReq.java | 47 ++++++ .../vo/request/IconDetailUpdateStatus.java | 32 ++++ .../icon/vo/request/IconGroupAddReq.java | 40 +++++ .../icon/vo/request/IconGroupListReq.java | 35 +++++ .../icon/vo/request/IconGroupUpdateReq.java | 38 +++++ .../vo/request/IconGroupUpdateStatusReq.java | 32 ++++ .../icon/vo/response/IconDetailListResp.java | 87 +++++++++++ .../icon/vo/response/IconGroupListResp.java | 52 +++++++ oss-client/src/main/resources/bootstrap.yml | 4 +- .../cn/axzo/oss/common/enums/CodeEnum.java | 6 +- 27 files changed, 1333 insertions(+), 3 deletions(-) create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/annotation/IsJsonString.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconDetailController.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconGroupController.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconDetail.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconGroup.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/mapper/IconDetailMapper.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/mapper/IconGroupMapper.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/package-info.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/repository/IconDetailRepository.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/repository/IconGroupRepository.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconDetailService.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconGroupService.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/validator/JsonStringValidator.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailAddReq.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailListReq.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailUpdateReq.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailUpdateStatus.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupAddReq.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupListReq.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupUpdateReq.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupUpdateStatusReq.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconDetailListResp.java create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconGroupListResp.java diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/annotation/IsJsonString.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/annotation/IsJsonString.java new file mode 100644 index 0000000..a5c5d17 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/annotation/IsJsonString.java @@ -0,0 +1,38 @@ +package cn.axzo.oss.client.icon.annotation; + +import cn.axzo.oss.client.icon.validator.JsonStringValidator; + +import javax.validation.Constraint; +import javax.validation.Payload; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 自定义注解，用于判断是否是json字符串 + * + * @author chenwenjian + * @version 1.0 + * @date 2023/12/19 17:49 + */ +@Documented +@Constraint(validatedBy = JsonStringValidator.class) +@Target(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +public @interface IsJsonString { + + /** + * 是否允许为空，默认允许 + * + * @return true/false + */ + boolean allowBlank() default true; + + String message() default "Invalid json string"; + + Class[] groups() default {}; + + Class[] payload() default {}; +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconDetailController.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconDetailController.java new file mode 100644 index 0000000..56eb5ff --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconDetailController.java @@ -0,0 +1,83 @@ +package cn.axzo.oss.client.icon.controller; + +import cn.axzo.oss.client.icon.service.IconDetailService; +import cn.axzo.oss.client.icon.vo.request.IconDetailAddReq; +import cn.axzo.oss.client.icon.vo.request.IconDetailListReq; +import cn.axzo.oss.client.icon.vo.request.IconDetailUpdateReq; +import cn.axzo.oss.client.icon.vo.request.IconDetailUpdateStatus; +import cn.axzo.oss.client.icon.vo.response.IconDetailListResp; +import cn.azxo.framework.common.model.CommonResponse; +import cn.hutool.json.JSONUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 图标详情 + * + * @author chenwenjian + * @version 1.0 + * @date 2023/12/19 17:25 + */ +@Slf4j +@RequiredArgsConstructor +@RestController +@RequestMapping("/icon") +public class IconDetailController { + + private final IconDetailService iconDetailService; + + /** + * 新增图标 + * + * @param req 图标信息 {@link IconDetailAddReq} + * @return true：成功 false：失败 + */ + @PostMapping("/add") + public CommonResponse add(@RequestBody @Validated IconDetailAddReq req) { + log.info("图标详情：req = {}", JSONUtil.toJsonStr(req)); + return CommonResponse.success(iconDetailService.add(req)); + } + + /** + * 更新图标信息 + * + * @param req 图标信息 {@link IconDetailUpdateReq} + * @return true：成功 false：失败 + */ + @PostMapping("/update") + public CommonResponse update(@RequestBody @Validated IconDetailUpdateReq req) { + log.info("更新图标信息：req = {}", JSONUtil.toJsonStr(req)); + return CommonResponse.success(iconDetailService.update(req)); + } + + /** + * 更新图标状态 + * + * @param req 图标信息 {@link IconDetailUpdateStatus} + * @return true：成功 false：失败 + */ + @PostMapping("/updateStatus") + public CommonResponse updateStatus(@RequestBody @Validated IconDetailUpdateStatus req) { + log.info("更新图标状态：req = {}", JSONUtil.toJsonStr(req)); + return CommonResponse.success(iconDetailService.updateStatus(req.getId(), req.getStatus())); + } + + /** + * 图标列表 + * + * @param req 图标信息 {@link IconDetailListReq} + * @return 图标列表，按创建时间倒序 {@link IconDetailListResp} + */ + @GetMapping("/list") + public CommonResponse> list(@RequestBody IconDetailListReq req) { + return CommonResponse.success(iconDetailService.list(req)); + } +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconGroupController.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconGroupController.java new file mode 100644 index 0000000..de81679 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconGroupController.java @@ -0,0 +1,84 @@ +package cn.axzo.oss.client.icon.controller; + +import cn.axzo.oss.client.icon.service.IconGroupService; +import cn.axzo.oss.client.icon.vo.request.IconGroupAddReq; +import cn.axzo.oss.client.icon.vo.request.IconGroupListReq; +import cn.axzo.oss.client.icon.vo.request.IconGroupUpdateReq; +import cn.axzo.oss.client.icon.vo.request.IconGroupUpdateStatusReq; +import cn.axzo.oss.client.icon.vo.response.IconGroupListResp; +import cn.azxo.framework.common.model.CommonResponse; +import cn.hutool.json.JSONUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 图标组管理 + * + * @author chenwenjian + * @version 1.0 + * @date 2023/12/19 17:27 + */ +@Slf4j +@RequiredArgsConstructor +@RestController +@RequestMapping("/icon/group") +public class IconGroupController { + + private final IconGroupService iconGroupService; + + /** + * 新增图标组 + * + * @param req 图标组信息 {@link IconGroupAddReq} + * @return 响应结果，成功返回true，失败返回false + */ + @PostMapping("/add") + public CommonResponse add(@RequestBody @Validated IconGroupAddReq req) { + log.info("新增图标组：req = {}", JSONUtil.toJsonStr(req)); + return CommonResponse.success(iconGroupService.add(req)); + } + + /** + * 更新图标组信息 + * + * @param req 图标组信息 {@link IconGroupUpdateReq} + * @return 响应结果，成功返回true，失败返回false + */ + @PostMapping("/update") + public CommonResponse update(@RequestBody @Validated IconGroupUpdateReq req) { + log.info("更新图标组信息：req = {}", JSONUtil.toJsonStr(req)); + return CommonResponse.success(iconGroupService.update(req)); + } + + /** + * 编辑图标组状态，同时将该组下所有图标状态更新 + * + * @param req 图标组信息 {@link IconGroupUpdateStatusReq} + * @return 响应结果，成功返回true，失败返回false + */ + @PostMapping("/updateStatus") + public CommonResponse updateStatus(@RequestBody @Validated IconGroupUpdateStatusReq req) { + log.info("更新图标组状态：id = {}，status = {}", req.getId(), req.getStatus()); + return CommonResponse.success(iconGroupService.updateStatus(req.getId(), req.getStatus())); + } + + /** + * 获取图标组列表 + * + * @param req 图标组列表查询条件 {@link IconGroupListReq} + * @return 图标组列表，按创建时间倒序 {@link IconGroupListResp} + */ + @PostMapping("/list") + public CommonResponse> list(@RequestBody IconGroupListReq req) { + log.info("获取图标组列表：req = {}", JSONUtil.toJsonStr(req)); + return CommonResponse.success(iconGroupService.list(req)); + } +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconDetail.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconDetail.java new file mode 100644 index 0000000..9a1fe4e --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconDetail.java @@ -0,0 +1,99 @@ +package cn.axzo.oss.client.icon.entity; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * 图标详情 + * + * @author chenwenjian + * @version 1.0 + * @date 2023/12/19 15:58 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@TableName("icon_detail") +public class IconDetail extends Model { + + /** + * 主键 + */ + @TableField("id") + private Long id; + + /** + * 图标组ID + */ + @TableField("group_id") + private Long groupId; + + /** + * 图标名称 + */ + @TableField("name") + private String name; + + /** + * 图标地址 + */ + @TableField("url") + private String url; + + /** + * 图标存储大小，单位KB + */ + @TableField("size") + private Double size; + + /** + * 尺寸-宽，单位mm + */ + @TableField("weight") + private Integer weight; + + /** + * 尺寸-高，单位mm + */ + @TableField("height") + private Integer height; + + /** + * 图标状态，0-未使用，1-使用中，2-已弃用，默认0 + */ + @TableField("status") + private Integer status; + + /** + * 扩展信息（json） + */ + @TableField("ext") + private String ext; + + /** + * 是否删除(0:未删除;1:已删除) + */ + @TableField("is_delete") + private Integer isDelete; + + /** + * 创建时间 + */ + @TableField("create_at") + private Date createAt; + + /** + * 修改时间 + */ + @TableField("update_at") + private Date updateAt; + +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconGroup.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconGroup.java new file mode 100644 index 0000000..45bd73d --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconGroup.java @@ -0,0 +1,73 @@ +package cn.axzo.oss.client.icon.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * 图标组 + * + * @author chenwenjian + * @version 1.0 + * @date 2023/12/19 17:11 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = true) +@TableName("icon_group") +public class IconGroup extends Model { + + /** + * 主键 + */ + @TableField("id") + private Long id; + + /** + * 终端，例如pc，h5 + */ + @TableField("terminal") + private String terminal; + + /** + * 图标组，例如cms，oms，cmp + */ + @TableField("group") + private String group; + + /** + * 图标组状态，0-未使用，1-使用中，2-已弃用，默认0 + */ + @TableField("status") + private Integer status; + + /** + * 扩展信息（json） + */ + @TableField("ext") + private String ext; + + /** + * 是否删除(0:未删除;1:已删除) + */ + @TableField("is_delete") + private Integer isDelete; + + /** + * 创建时间 + */ + @TableField("create_at") + private Date createAt; + + /** + * 修改时间 + */ + @TableField("update_at") + private Date updateAt; + +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/mapper/IconDetailMapper.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/mapper/IconDetailMapper.java new file mode 100644 index 0000000..d256a33 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/mapper/IconDetailMapper.java @@ -0,0 +1,16 @@ +package cn.axzo.oss.client.icon.mapper; + +import cn.axzo.oss.client.icon.entity.IconDetail; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 图标详情Mapper + * + * @author chenwenjian + * @version 1.0 + * @date 2023/12/19 17:16 + */ +@Mapper +public interface IconDetailMapper extends BaseMapper { +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/mapper/IconGroupMapper.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/mapper/IconGroupMapper.java new file mode 100644 index 0000000..9ecd139 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/mapper/IconGroupMapper.java @@ -0,0 +1,16 @@ +package cn.axzo.oss.client.icon.mapper; + +import cn.axzo.oss.client.icon.entity.IconGroup; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 图标分组Mapper + * + * @author chenwenjian + * @version 1.0 + * @date 2023/12/19 17:18 + */ +@Mapper +public interface IconGroupMapper extends BaseMapper { +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/package-info.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/package-info.java new file mode 100644 index 0000000..e8b6da7 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/package-info.java @@ -0,0 +1,8 @@ +/** + * axzo图标管理 + * + * @author chenwenjian + * @date 2023/12/19 15:57 + * @version 1.0 + */ +package cn.axzo.oss.client.icon; \ No newline at end of file diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/repository/IconDetailRepository.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/repository/IconDetailRepository.java new file mode 100644 index 0000000..2343a42 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/repository/IconDetailRepository.java @@ -0,0 +1,16 @@ +package cn.axzo.oss.client.icon.repository; + +import cn.axzo.oss.client.icon.entity.IconDetail; +import cn.axzo.oss.client.icon.mapper.IconDetailMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Repository; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2023/12/19 17:19 + */ +@Repository +public class IconDetailRepository extends ServiceImpl { + +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/repository/IconGroupRepository.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/repository/IconGroupRepository.java new file mode 100644 index 0000000..844ee84 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/repository/IconGroupRepository.java @@ -0,0 +1,15 @@ +package cn.axzo.oss.client.icon.repository; + +import cn.axzo.oss.client.icon.entity.IconGroup; +import cn.axzo.oss.client.icon.mapper.IconGroupMapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Repository; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2023/12/19 17:23 + */ +@Repository +public class IconGroupRepository extends ServiceImpl { +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconDetailService.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconDetailService.java new file mode 100644 index 0000000..87f90b7 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconDetailService.java @@ -0,0 +1,50 @@ +package cn.axzo.oss.client.icon.service; + +import cn.axzo.oss.client.icon.vo.request.IconDetailAddReq; +import cn.axzo.oss.client.icon.vo.request.IconDetailListReq; +import cn.axzo.oss.client.icon.vo.request.IconDetailUpdateReq; +import cn.axzo.oss.client.icon.vo.request.IconDetailUpdateStatus; +import cn.axzo.oss.client.icon.vo.response.IconDetailListResp; + +import java.util.List; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2023/12/19 17:24 + */ +public interface IconDetailService { + + /** + * 新增图标 + * + * @param req 图标信息 {@link IconDetailAddReq} + * @return true：成功 false：失败 + */ + Boolean add(IconDetailAddReq req); + + /** + * 更新图标信息 + * + * @param req 图标信息 {@link IconDetailUpdateReq} + * @return true：成功 false：失败 + */ + Boolean update(IconDetailUpdateReq req); + + /** + * 更新图标状态 + * + * @param id 图标id + * @param status 状态 + * @return true：成功 false：失败 + */ + Boolean updateStatus(Long id, Integer status); + + /** + * 图标列表 + * + * @param req 图标列表请求 {@link IconDetailListReq} + * @return 图标列表 + */ + List list(IconDetailListReq req); +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconGroupService.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconGroupService.java new file mode 100644 index 0000000..49b587f --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconGroupService.java @@ -0,0 +1,48 @@ +package cn.axzo.oss.client.icon.service; + +import cn.axzo.oss.client.icon.vo.request.IconGroupAddReq; +import cn.axzo.oss.client.icon.vo.request.IconGroupListReq; +import cn.axzo.oss.client.icon.vo.request.IconGroupUpdateReq; +import cn.axzo.oss.client.icon.vo.response.IconGroupListResp; + +import java.util.List; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2023/12/19 17:23 + */ +public interface IconGroupService { + + /** + * 添加图标组 + * + * @param req 图标组信息 {@link IconGroupAddReq} + * @return true:添加成功 false:添加失败 + */ + Boolean add(IconGroupAddReq req); + + /** + * 修改图标组信息 + * + * @param req 图标组信息 {@link IconGroupUpdateReq} + * @return true:修改成功 false:修改失败 + */ + Boolean update(IconGroupUpdateReq req); + + /** + * 修改图标组状态 + * + * @param id 图标组id + * @param status 状态：0-未使用，1-使用中，2-已弃用 + * @return true:修改成功 false:修改失败 + */ + Boolean updateStatus(Long id, Integer status); + + /** + * 查询图标组列表 + * + * @return 图标组列表 {@link IconGroupListResp} + */ + List list(IconGroupListReq req); +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java new file mode 100644 index 0000000..8b5e311 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java @@ -0,0 +1,145 @@ +package cn.axzo.oss.client.icon.service.impl; + +import cn.axzo.basics.common.BeanMapper; +import cn.axzo.oss.client.icon.entity.IconDetail; +import cn.axzo.oss.client.icon.entity.IconGroup; +import cn.axzo.oss.client.icon.mapper.IconDetailMapper; +import cn.axzo.oss.client.icon.repository.IconDetailRepository; +import cn.axzo.oss.client.icon.repository.IconGroupRepository; +import cn.axzo.oss.client.icon.service.IconDetailService; +import cn.axzo.oss.client.icon.vo.request.IconDetailAddReq; +import cn.axzo.oss.client.icon.vo.request.IconDetailListReq; +import cn.axzo.oss.client.icon.vo.request.IconDetailUpdateReq; +import cn.axzo.oss.client.icon.vo.response.IconDetailListResp; +import cn.axzo.oss.common.enums.CodeEnum; +import cn.axzo.oss.common.exception.BizException; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.function.BiConsumer; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2023/12/19 17:25 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class IconDetailServiceImpl implements IconDetailService { + + private final IconGroupRepository iconGroupRepository; + + private final IconDetailRepository iconDetailRepository; + + /** + * 新增图标 + * + * @param req 图标信息 {@link IconDetailAddReq} + * @return true：成功 false：失败 + */ + @Override + public Boolean add(IconDetailAddReq req) { + IconDetail iconDetail = iconDetailRepository.lambdaQuery() + .eq(IconDetail::getGroupId, req.getGroupId()) + .eq(IconDetail::getName, req.getName()) + .eq(IconDetail::getIsDelete, 0) + .apply("limit 1") + .one(); + // 存在 + BizException.error(Objects.isNull(iconDetail), CodeEnum.ICON_EXIST); + return iconDetailRepository.save(BeanMapper.copyBean(req, IconDetail.class)); + } + + /** + * 修改图标 + * + * @param req 图标信息 {@link IconDetailUpdateReq} + * @return true：成功 false：失败 + */ + @Override + public Boolean update(IconDetailUpdateReq req) { + IconDetail iconDetail = iconDetailRepository.getById(req.getId()); + if (Objects.isNull(iconDetail)) { + return true; + } + return iconDetailRepository.lambdaUpdate() + .eq(IconDetail::getId, req.getId()) + .set(IconDetail::getGroupId, req.getGroupId()) + .set(IconDetail::getName, req.getName()) + .set(IconDetail::getExt, req.getExt()) + .update(); + } + + /** + * 修改图标状态 + * + * @param id 图标id + * @param status 状态 + * @return true：成功 false：失败 + */ + @Override + public Boolean updateStatus(Long id, Integer status) { + IconDetail iconDetail = iconDetailRepository.getById(id); + if (Objects.isNull(iconDetail)) { + return true; + } + // 状态未变则不修改 + if (Objects.equals(iconDetail.getStatus(), status)) { + return true; + } + // 修改状态 + iconDetail.setStatus(status); + return iconDetailRepository.updateById(iconDetail); + } + + /** + * 图标列表 + * + * @param req 图标列表查询参数 {@link IconDetailListReq} + * @return 图标列表 {@link IconDetailListResp} + */ + @Override + public List list(IconDetailListReq req) { + // 查询图标列表 + List iconDetailList = iconDetailRepository.lambdaQuery() + .eq(IconDetail::getIsDelete, 0) + .in(!CollectionUtils.isEmpty(req.getGroupIds()), IconDetail::getGroupId, req.getGroupIds()) + .in(!CollectionUtils.isEmpty(req.getIds()), IconDetail::getId, req.getIds()) + .like(StringUtils.hasText(req.getName()), IconDetail::getName, req) + .in(!CollectionUtils.isEmpty(req.getStatuses()), IconDetail::getStatus, req.getStatuses()) + .orderByDesc(IconDetail::getCreateAt) + .list(); + if (CollectionUtils.isEmpty(iconDetailList)) { + return Collections.emptyList(); + } + + List groupIds = iconDetailList.stream() + .mapToLong(IconDetail::getGroupId) + .distinct() + .boxed() + .collect(Collectors.toList()); + + // 查询分组信息 + List iconGroups = iconGroupRepository.listByIds(groupIds); + BizException.error(!CollectionUtils.isEmpty(iconGroups), 500, "数据异常"); + + Map groupMap = iconGroups.stream().collect(Collectors.toMap(IconGroup::getId, Function.identity())); + + return BeanMapper.copyList(iconDetailList, IconDetailListResp.class, (iconDetail, iconDetailListResp) -> { + iconDetailListResp.setTerminal(groupMap.get(iconDetail.getGroupId()).getTerminal()); + iconDetailListResp.setGroupName(groupMap.get(iconDetail.getGroupId()).getGroup()); + }); + } +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java new file mode 100644 index 0000000..5455484 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java @@ -0,0 +1,124 @@ +package cn.axzo.oss.client.icon.service.impl; + +import cn.axzo.basics.common.BeanMapper; +import cn.axzo.oss.client.icon.entity.IconDetail; +import cn.axzo.oss.client.icon.entity.IconGroup; +import cn.axzo.oss.client.icon.repository.IconDetailRepository; +import cn.axzo.oss.client.icon.repository.IconGroupRepository; +import cn.axzo.oss.client.icon.service.IconGroupService; +import cn.axzo.oss.client.icon.vo.request.IconGroupAddReq; +import cn.axzo.oss.client.icon.vo.request.IconGroupListReq; +import cn.axzo.oss.client.icon.vo.request.IconGroupUpdateReq; +import cn.axzo.oss.client.icon.vo.response.IconGroupListResp; +import cn.axzo.oss.common.enums.CodeEnum; +import cn.axzo.oss.common.exception.BizException; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.util.List; +import java.util.Objects; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2023/12/19 17:24 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class IconGroupServiceImpl implements IconGroupService { + + private final IconGroupRepository iconGroupRepository; + + private final IconDetailRepository iconDetailRepository; + + /** + * 新增图标组 + * + * @param req 图标组信息 + * @return true:添加成功 false:添加失败 + */ + @Override + public Boolean add(IconGroupAddReq req) { + // 检查该图标组是否已存在 + IconGroup iconGroup = iconGroupRepository.lambdaQuery() + .eq(IconGroup::getTerminal, req.getTerminal()) + .eq(IconGroup::getGroup, req.getGroup()) + .eq(IconGroup::getIsDelete, 0) + .apply("limit 1") + .one(); + // 存在 + BizException.error(Objects.isNull(iconGroup), CodeEnum.ICON_GROUP_EXIST); + return iconGroupRepository.save(BeanMapper.copyBean(req, IconGroup.class)); + } + + /** + * 修改图标组信息 + * + * @param req 图标组信息 + * @return true:修改成功 false:修改失败 + */ + @Override + public Boolean update(IconGroupUpdateReq req) { + // 查询图标组信息 + IconGroup iconGroup = iconGroupRepository.getById(req.getId()); + if (Objects.isNull(iconGroup)) { + return true; + } + return iconGroupRepository.lambdaUpdate() + .eq(IconGroup::getId, req.getId()) + .set(IconGroup::getGroup, req.getGroup()) + .set(IconGroup::getExt, req.getExt()) + .update(); + } + + /** + * 修改图标组状态 + * + * @param id 图标组id + * @param status 状态：0-未使用，1-使用中，2-已弃用 + * @return true:修改成功 false:修改失败 + */ + @Override + @Transactional + public Boolean updateStatus(Long id, Integer status) { + // 查询图标组信息 + IconGroup iconGroup = iconGroupRepository.getById(id); + if (Objects.isNull(iconGroup)) { + return true; + } + // 状态未变则不修改 + if (Objects.equals(iconGroup.getStatus(), status)) { + return true; + } + // 修改状态，并修改该图标组下所有图标的状态 + iconGroup.setStatus(status); + iconDetailRepository.lambdaUpdate() + .eq(IconDetail::getGroupId, iconGroup.getId()) + .eq(IconDetail::getIsDelete, 0) + .set(IconDetail::getStatus, status) + .update(); + return iconGroupRepository.updateById(iconGroup); + } + + /** + * 查询图标组列表 + * + * @param req 图标组列表条件 + * @return 图标组列表 + */ + @Override + public List list(IconGroupListReq req) { + List iconGroups = iconGroupRepository.lambdaQuery() + .eq(IconGroup::getIsDelete, 0) + .in(!CollectionUtils.isEmpty(req.getTerminals()), IconGroup::getTerminal, req.getTerminals()) + .in(!CollectionUtils.isEmpty(req.getGroups()), IconGroup::getGroup, req.getGroups()) + .in(CollectionUtils.isEmpty(req.getStatuses()), IconGroup::getStatus, req.getStatuses()) + .orderByDesc(IconGroup::getCreateAt) + .list(); + return BeanMapper.copyList(iconGroups, IconGroupListResp.class); + } +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/validator/JsonStringValidator.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/validator/JsonStringValidator.java new file mode 100644 index 0000000..f8500b1 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/validator/JsonStringValidator.java @@ -0,0 +1,37 @@ +package cn.axzo.oss.client.icon.validator; + +import cn.axzo.oss.client.icon.annotation.IsJsonString; +import com.alibaba.fastjson.JSON; + +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; + +/** + * json字符串校验器 + * + * @author chenwenjian + * @version 1.0 + * @date 2023/12/19 17:55 + */ +public class JsonStringValidator implements ConstraintValidator { + + private boolean allowBlank = true; + + @Override + public void initialize(IsJsonString constraintAnnotation) { + allowBlank = constraintAnnotation.allowBlank(); + } + + @Override + public boolean isValid(String value, ConstraintValidatorContext context) { + if (value == null || value.isEmpty()) { + return allowBlank; + } + try { + Object o = JSON.parse(value); + return true; + } catch (Exception e) { + return false; + } + } +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailAddReq.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailAddReq.java new file mode 100644 index 0000000..5139831 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailAddReq.java @@ -0,0 +1,71 @@ +package cn.axzo.oss.client.icon.vo.request; + +import cn.axzo.oss.client.icon.annotation.IsJsonString; +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2023/12/20 17:32 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class IconDetailAddReq { + + /** + * 图标组ID + */ + @NotNull(message = "图标组id不能为空") + private Long groupId; + + /** + * 图标名称 + */ + @NotBlank(message = "图标名称不能为空") + private String name; + + /** + * 图标地址 + */ + @NotBlank(message = "图标地址不能为空") + private String url; + + /** + * 图标存储大小，单位KB + */ + @Min(value = 0, message = "图标存储大小不能小于0") + @NotNull(message = "图标存储大小不能为空") + private Double size; + + /** + * 尺寸-宽，单位mm@ + */ + @Min(value = 0, message = "图标宽度不能小于0") + @NotNull(message = "图标宽度不能为空") + private Integer weight; + + /** + * 尺寸-高，单位mm + */ + @Min(value = 0, message = "图标高度不能小于0") + @NotNull(message = "图标高度不能为空") + private Integer height; + + /** + * 扩展信息（json） + */ + @IsJsonString(message = "扩展信息格式不正确") + private String ext; + +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailListReq.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailListReq.java new file mode 100644 index 0000000..fe3cbc1 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailListReq.java @@ -0,0 +1,40 @@ +package cn.axzo.oss.client.icon.vo.request; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2023/12/20 19:54 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class IconDetailListReq { + + /** + * 图标ID，多个用逗号分隔 + */ + private List ids; + + /** + * 分组ID，多个用逗号分隔 + */ + private List groupIds; + + /** + * 名称，模糊查询 + */ + private String name; + + /** + * 状态，0：正常，1：禁用，多个用逗号分隔 + */ + private List statuses; +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailUpdateReq.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailUpdateReq.java new file mode 100644 index 0000000..6692cda --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailUpdateReq.java @@ -0,0 +1,47 @@ +package cn.axzo.oss.client.icon.vo.request; + +import cn.axzo.oss.client.icon.annotation.IsJsonString; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2023/12/20 18:11 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class IconDetailUpdateReq { + + /** + * 图标ID + */ + @NotNull(message = "图标id不能为空") + private Long id; + + /** + * 图标组ID + */ + @NotNull(message = "图标组id不能为空") + private Long groupId; + + /** + * 图标名称 + */ + @NotBlank(message = "图标名称不能为空") + private String name; + + /** + * 扩展信息（json） + */ + @IsJsonString(message = "扩展信息格式不正确") + private String ext; +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailUpdateStatus.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailUpdateStatus.java new file mode 100644 index 0000000..08b7f62 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailUpdateStatus.java @@ -0,0 +1,32 @@ +package cn.axzo.oss.client.icon.vo.request; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotNull; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2023/12/20 18:22 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class IconDetailUpdateStatus { + + /** + * 图标id + */ + @NotNull(message = "图标id不能为空") + private Long id; + + /** + * 图标状态，状态：0-未使用，1-使用中，2-已弃用 + */ + @NotNull(message = "图标状态不能为空") + private Integer status; +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupAddReq.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupAddReq.java new file mode 100644 index 0000000..b1a7412 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupAddReq.java @@ -0,0 +1,40 @@ +package cn.axzo.oss.client.icon.vo.request; + +import cn.axzo.oss.client.icon.annotation.IsJsonString; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2023/12/19 17:37 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class IconGroupAddReq { + + /** + * 终端，例如pc，h5 + */ + @NotBlank(message = "段类型不能为空") + private String terminal; + + /** + * 图标组，例如cms，oms，cmp + */ + @NotBlank(message = "图标组不能为空") + private String group; + + /** + * 扩展信息（json） + */ + @IsJsonString(message = "扩展信息格式不正确") + private String ext; + +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupListReq.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupListReq.java new file mode 100644 index 0000000..261567d --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupListReq.java @@ -0,0 +1,35 @@ +package cn.axzo.oss.client.icon.vo.request; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2023/12/20 18:31 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class IconGroupListReq { + + /** + * 终端，pc，h5，多个用逗号分隔 + */ + List terminals; + + /** + * 图标组, 多个用逗号分隔 + */ + List groups; + + /** + * 状态，0：正常，1：禁用，多个用逗号分隔 + */ + List statuses; +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupUpdateReq.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupUpdateReq.java new file mode 100644 index 0000000..c17677e --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupUpdateReq.java @@ -0,0 +1,38 @@ +package cn.axzo.oss.client.icon.vo.request; + +import cn.axzo.oss.client.icon.annotation.IsJsonString; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2023/12/20 17:08 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class IconGroupUpdateReq { + + /** + * 图标组id + */ + private Long id; + + /** + * 图标组，例如cms，oms，cmp + */ + @NotBlank(message = "图标组名不能为空") + private String group; + + /** + * 扩展信息（json） + */ + @IsJsonString(message = "扩展信息格式不正确") + private String ext; +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupUpdateStatusReq.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupUpdateStatusReq.java new file mode 100644 index 0000000..5171a4a --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupUpdateStatusReq.java @@ -0,0 +1,32 @@ +package cn.axzo.oss.client.icon.vo.request; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotNull; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2023/12/20 16:56 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class IconGroupUpdateStatusReq { + + /** + * 图标组id + */ + @NotNull(message = "图标组id不能为空") + private Long id; + + /** + * 图标组状态，状态：0-未使用，1-使用中，2-已弃用 + */ + @NotNull(message = "图标组状态不能为空") + private Integer status; +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconDetailListResp.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconDetailListResp.java new file mode 100644 index 0000000..74c05a5 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconDetailListResp.java @@ -0,0 +1,87 @@ +package cn.axzo.oss.client.icon.vo.response; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2023/12/20 19:59 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class IconDetailListResp { + + /** + * 主键 + */ + private Long id; + + /** + * 终端，例如pc，h5 + */ + private String terminal; + + /** + * 图标组ID + */ + private Long groupId; + + /** + * 图标组名称 + */ + private String groupName; + + /** + * 图标名称 + */ + private String name; + + /** + * 图标地址 + */ + private String url; + + /** + * 图标存储大小，单位KB + */ + private Double size; + + /** + * 尺寸-宽，单位mm + */ + private Integer weight; + + /** + * 尺寸-高，单位mm + */ + private Integer height; + + /** + * 图标状态，0-未使用，1-使用中，2-已弃用，默认0 + */ + private Integer status; + + /** + * 扩展信息（json） + */ + private String ext; + + /** + * 创建时间 + */ + private Date createAt; + + /** + * 修改时间 + */ + private Date updateAt; + +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconGroupListResp.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconGroupListResp.java new file mode 100644 index 0000000..bf4477d --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconGroupListResp.java @@ -0,0 +1,52 @@ +package cn.axzo.oss.client.icon.vo.response; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2023/12/19 17:30 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class IconGroupListResp { + + /** + * 主键 + */ + private Long id; + + /** + * 终端，例如pc，h5 + */ + private String terminal; + + /** + * 图标组，例如cms，oms，cmp + */ + private String group; + + /** + * 扩展信息（json） + */ + private String ext; + + /** + * 创建时间 + */ + private Date createAt; + + /** + * 修改时间 + */ + private Date updateAt; + +} diff --git a/oss-client/src/main/resources/bootstrap.yml b/oss-client/src/main/resources/bootstrap.yml index 579e4c7..1ece507 100644 --- a/oss-client/src/main/resources/bootstrap.yml +++ b/oss-client/src/main/resources/bootstrap.yml @@ -4,12 +4,12 @@ spring: cloud: nacos: config: - server-addr: ${NACOS_HOST:dev-nacos.axzo.cn}:${NACOS_PORT:80} + server-addr: ${NACOS_HOST:https://dev-nacos.axzo.cn}:${NACOS_PORT:443} file-extension: yaml namespace: ${NACOS_NAMESPACE_ID:35eada10-9574-4db8-9fea-bc6a4960b6c7} prefix: ${spring.application.name} profiles: - active: ${NACOS_PROFILES_ACTIVE:local} + active: ${NACOS_PROFILES_ACTIVE:dev} main: allow-bean-definition-overriding: true diff --git a/oss-common/src/main/java/cn/axzo/oss/common/enums/CodeEnum.java b/oss-common/src/main/java/cn/axzo/oss/common/enums/CodeEnum.java index 61684f2..a52c44b 100644 --- a/oss-common/src/main/java/cn/axzo/oss/common/enums/CodeEnum.java +++ b/oss-common/src/main/java/cn/axzo/oss/common/enums/CodeEnum.java @@ -46,7 +46,11 @@ public enum CodeEnum implements EnumBase { FILE_NOT_FOUND(112, "文件不存在"), MULTIPART_UPLOAD_INIT_ERROR(113, "文件类型初始化失败"), MULTIPART_UPLOAD_ERROR(114, "文件上传失败"), - MULTIPART_UPLOAD_COMPLETE_ERROR(115, "文件上传失败") + MULTIPART_UPLOAD_COMPLETE_ERROR(115, "文件上传失败"), + + ICON_GROUP_EXIST(116, "图标组已存在"), + ICON_EXIST(117, "图标已存在") + ; From 8accefb74c8c13bb33819e820764a6a02657fd03 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Thu, 21 Dec 2023 17:14:27 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat(icon=5Fmanage):=20=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/axzo/oss/client/Bootstrap.java | 2 +- .../icon/controller/IconDetailController.java | 16 +++++- .../icon/controller/IconGroupController.java | 15 +++++ .../oss/client/icon/entity/IconDetail.java | 11 ++-- .../oss/client/icon/entity/IconGroup.java | 16 ++++-- .../icon/service/IconDetailService.java | 8 +++ .../client/icon/service/IconGroupService.java | 8 +++ .../service/impl/IconDetailServiceImpl.java | 56 +++++++++++++++++-- .../service/impl/IconGroupServiceImpl.java | 21 +++++-- .../icon/vo/request/IconDetailAddReq.java | 5 +- .../icon/vo/request/IconDetailUpdateReq.java | 5 +- .../icon/vo/request/IconGroupAddReq.java | 4 +- .../icon/vo/request/IconGroupUpdateReq.java | 6 +- .../icon/vo/response/IconDetailListResp.java | 1 + .../icon/vo/response/IconGroupListResp.java | 1 + .../cn/axzo/oss/common/enums/CodeEnum.java | 3 +- 16 files changed, 149 insertions(+), 29 deletions(-) diff --git a/oss-client/src/main/java/cn/axzo/oss/client/Bootstrap.java b/oss-client/src/main/java/cn/axzo/oss/client/Bootstrap.java index 3776998..9e9d26d 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/Bootstrap.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/Bootstrap.java @@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; * @since 2021-07-15 11:34 */ @Slf4j -@MapperScan(basePackages = {"cn.axzo.oss.dal.mapper"}) +@MapperScan(basePackages = {"cn.axzo.oss.dal.mapper", "cn.axzo.oss.client.icon.mapper"}) @EnableFeignClients(basePackages = {"cn.axzo.log.platform.client"}) @SpringBootApplication(scanBasePackages = {"cn.axzo.oss"}) public class Bootstrap { diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconDetailController.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconDetailController.java index 56eb5ff..59089ab 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconDetailController.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconDetailController.java @@ -15,8 +15,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -46,6 +48,18 @@ public class IconDetailController { return CommonResponse.success(iconDetailService.add(req)); } + /** + * 根据id查询图标详情 + * + * @param id 图标id + * @return 图标详情 + */ + @GetMapping("/detailById") + public CommonResponse detailById(@RequestParam("id") @NotNull(message = "图标id不能为空") Long id) { + log.info("图标详情：id = {}", id); + return CommonResponse.success(iconDetailService.detailById(id)); + } + /** * 更新图标信息 * @@ -76,7 +90,7 @@ public class IconDetailController { * @param req 图标信息 {@link IconDetailListReq} * @return 图标列表，按创建时间倒序 {@link IconDetailListResp} */ - @GetMapping("/list") + @PostMapping("/list") public CommonResponse> list(@RequestBody IconDetailListReq req) { return CommonResponse.success(iconDetailService.list(req)); } diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconGroupController.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconGroupController.java index de81679..8de662d 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconGroupController.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconGroupController.java @@ -5,6 +5,7 @@ import cn.axzo.oss.client.icon.vo.request.IconGroupAddReq; import cn.axzo.oss.client.icon.vo.request.IconGroupListReq; import cn.axzo.oss.client.icon.vo.request.IconGroupUpdateReq; import cn.axzo.oss.client.icon.vo.request.IconGroupUpdateStatusReq; +import cn.axzo.oss.client.icon.vo.response.IconDetailListResp; import cn.axzo.oss.client.icon.vo.response.IconGroupListResp; import cn.azxo.framework.common.model.CommonResponse; import cn.hutool.json.JSONUtil; @@ -15,8 +16,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -46,6 +49,18 @@ public class IconGroupController { return CommonResponse.success(iconGroupService.add(req)); } + /** + * 查询图标组详情 + * + * @param id 图标组id + * @return 图标组详情 {@link IconDetailListResp} + */ + @GetMapping("/detailById") + public CommonResponse detailById(@RequestParam("id") @NotNull(message = "图标组id不能为空") Long id) { + log.info("查询图标组详情：id = {}", id); + return CommonResponse.success(iconGroupService.detailById(id)); + } + /** * 更新图标组信息 * diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconDetail.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconDetail.java index 9a1fe4e..8b53227 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconDetail.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconDetail.java @@ -1,9 +1,12 @@ package cn.axzo.oss.client.icon.entity; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; @@ -21,13 +24,13 @@ import java.util.Date; @Data @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@TableName("icon_detail") +@TableName(value = "icon_detail", autoResultMap = true) public class IconDetail extends Model { /** * 主键 */ - @TableField("id") + @TableId(value = "id", type = IdType.AUTO) private Long id; /** @@ -69,13 +72,13 @@ public class IconDetail extends Model { /** * 图标状态，0-未使用，1-使用中，2-已弃用，默认0 */ - @TableField("status") + @TableField("`status`") private Integer status; /** * 扩展信息（json） */ - @TableField("ext") + @TableField(value = "ext", typeHandler = FastjsonTypeHandler.class) private String ext; /** diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconGroup.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconGroup.java index 45bd73d..48db7e8 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconGroup.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconGroup.java @@ -1,13 +1,19 @@ package cn.axzo.oss.client.icon.entity; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.util.Date; +import java.util.Map; /** * 图标组 @@ -19,13 +25,13 @@ import java.util.Date; @Data @Accessors(chain = true) @EqualsAndHashCode(callSuper = true) -@TableName("icon_group") +@TableName(value = "icon_group", autoResultMap = true) public class IconGroup extends Model { /** * 主键 */ - @TableField("id") + @TableId(value = "id", type = IdType.AUTO) private Long id; /** @@ -37,19 +43,19 @@ public class IconGroup extends Model { /** * 图标组，例如cms，oms，cmp */ - @TableField("group") + @TableField("`group`") private String group; /** * 图标组状态，0-未使用，1-使用中，2-已弃用，默认0 */ - @TableField("status") + @TableField("`status`") private Integer status; /** * 扩展信息（json） */ - @TableField("ext") + @TableField(value = "ext", typeHandler = FastjsonTypeHandler.class) private String ext; /** diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconDetailService.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconDetailService.java index 87f90b7..a653881 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconDetailService.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconDetailService.java @@ -47,4 +47,12 @@ public interface IconDetailService { * @return 图标列表 */ List list(IconDetailListReq req); + + /** + * 图标详情 + * + * @param id 图标id + * @return 图标详情 + */ + IconDetailListResp detailById(Long id); } diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconGroupService.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconGroupService.java index 49b587f..d7829cd 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconGroupService.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconGroupService.java @@ -45,4 +45,12 @@ public interface IconGroupService { * @return 图标组列表 {@link IconGroupListResp} */ List list(IconGroupListReq req); + + /** + * 查询图标组详情 + * + * @param id 图标组id + * @return 图标组详情 + */ + IconGroupListResp detailById(Long id); } diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java index 8b5e311..4d305aa 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java @@ -13,9 +13,11 @@ import cn.axzo.oss.client.icon.vo.request.IconDetailUpdateReq; import cn.axzo.oss.client.icon.vo.response.IconDetailListResp; import cn.axzo.oss.common.enums.CodeEnum; import cn.axzo.oss.common.exception.BizException; +import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -51,15 +53,24 @@ public class IconDetailServiceImpl implements IconDetailService { */ @Override public Boolean add(IconDetailAddReq req) { + // 校验图标组是否存在 + IconGroup iconGroup = iconGroupRepository.lambdaQuery() + .eq(IconGroup::getId, req.getGroupId()) + .eq(IconGroup::getIsDelete, 0) + .lt(IconGroup::getStatus, 2) + .last("limit 1") + .one(); + BizException.error(Objects.nonNull(iconGroup), CodeEnum.ICON_GROUP_NOT_EXIST); + // 校验图标是否已存在 IconDetail iconDetail = iconDetailRepository.lambdaQuery() .eq(IconDetail::getGroupId, req.getGroupId()) .eq(IconDetail::getName, req.getName()) .eq(IconDetail::getIsDelete, 0) - .apply("limit 1") + .last("limit 1") .one(); // 存在 BizException.error(Objects.isNull(iconDetail), CodeEnum.ICON_EXIST); - return iconDetailRepository.save(BeanMapper.copyBean(req, IconDetail.class)); + return iconDetailRepository.save(BeanMapper.copyBean(req, IconDetail.class, (r, i) -> i.setExt(JSONUtil.toJsonStr(r.getExt())))); } /** @@ -78,7 +89,7 @@ public class IconDetailServiceImpl implements IconDetailService { .eq(IconDetail::getId, req.getId()) .set(IconDetail::getGroupId, req.getGroupId()) .set(IconDetail::getName, req.getName()) - .set(IconDetail::getExt, req.getExt()) + .set(IconDetail::getExt, JSONUtil.toJsonStr(req.getExt())) .update(); } @@ -90,6 +101,7 @@ public class IconDetailServiceImpl implements IconDetailService { * @return true：成功 false：失败 */ @Override + @Transactional public Boolean updateStatus(Long id, Integer status) { IconDetail iconDetail = iconDetailRepository.getById(id); if (Objects.isNull(iconDetail)) { @@ -99,9 +111,23 @@ public class IconDetailServiceImpl implements IconDetailService { if (Objects.equals(iconDetail.getStatus(), status)) { return true; } - // 修改状态 + // 修改图标状态 iconDetail.setStatus(status); - return iconDetailRepository.updateById(iconDetail); + iconDetailRepository.updateById(iconDetail); + // 若修改图标状态后，该分组下所有图标均为同一状态（本次修改的目标状态），则修改图标组状态 + List iconDetailList = iconDetailRepository.lambdaQuery() + .eq(IconDetail::getIsDelete, 0) + .eq(IconDetail::getGroupId, iconDetail.getGroupId()) + .list(); + boolean allMatch = iconDetailList.stream().allMatch(iconDetail1 -> Objects.equals(iconDetail1.getStatus(), status)); + if (!allMatch) { + return true; + } + return iconGroupRepository.lambdaUpdate() + .eq(IconGroup::getIsDelete, 0) + .eq(IconGroup::getId, iconDetail.getGroupId()) + .set(IconGroup::getStatus, status) + .update(); } /** @@ -142,4 +168,24 @@ public class IconDetailServiceImpl implements IconDetailService { iconDetailListResp.setGroupName(groupMap.get(iconDetail.getGroupId()).getGroup()); }); } + + /** + * 图标详情 + * + * @param id 图标id + * @return 图标详情 {@link IconDetailListResp} + */ + @Override + public IconDetailListResp detailById(Long id) { + IconDetail iconDetail = iconDetailRepository.getById(id); + if (Objects.isNull(iconDetail)) { + return null; + } + IconGroup iconGroup = iconGroupRepository.getById(iconDetail.getGroupId()); + BizException.error(Objects.nonNull(iconGroup), 500, "数据异常"); + return BeanMapper.copyBean(iconDetail, IconDetailListResp.class, (i, r) -> { + r.setTerminal(iconGroup.getTerminal()); + r.setGroupName(iconGroup.getGroup()); + }); + } } diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java index 5455484..4976190 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java @@ -12,6 +12,7 @@ import cn.axzo.oss.client.icon.vo.request.IconGroupUpdateReq; import cn.axzo.oss.client.icon.vo.response.IconGroupListResp; import cn.axzo.oss.common.enums.CodeEnum; import cn.axzo.oss.common.exception.BizException; +import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -20,6 +21,7 @@ import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Objects; +import java.util.function.BiConsumer; /** * @author chenwenjian @@ -48,11 +50,11 @@ public class IconGroupServiceImpl implements IconGroupService { .eq(IconGroup::getTerminal, req.getTerminal()) .eq(IconGroup::getGroup, req.getGroup()) .eq(IconGroup::getIsDelete, 0) - .apply("limit 1") + .last("limit 1") .one(); // 存在 BizException.error(Objects.isNull(iconGroup), CodeEnum.ICON_GROUP_EXIST); - return iconGroupRepository.save(BeanMapper.copyBean(req, IconGroup.class)); + return iconGroupRepository.save(BeanMapper.copyBean(req, IconGroup.class, (r, i) -> i.setExt(JSONUtil.toJsonStr(r.getExt())))); } /** @@ -71,7 +73,7 @@ public class IconGroupServiceImpl implements IconGroupService { return iconGroupRepository.lambdaUpdate() .eq(IconGroup::getId, req.getId()) .set(IconGroup::getGroup, req.getGroup()) - .set(IconGroup::getExt, req.getExt()) + .set(IconGroup::getExt, JSONUtil.toJsonStr(req.getExt())) .update(); } @@ -116,9 +118,20 @@ public class IconGroupServiceImpl implements IconGroupService { .eq(IconGroup::getIsDelete, 0) .in(!CollectionUtils.isEmpty(req.getTerminals()), IconGroup::getTerminal, req.getTerminals()) .in(!CollectionUtils.isEmpty(req.getGroups()), IconGroup::getGroup, req.getGroups()) - .in(CollectionUtils.isEmpty(req.getStatuses()), IconGroup::getStatus, req.getStatuses()) + .in(!CollectionUtils.isEmpty(req.getStatuses()), IconGroup::getStatus, req.getStatuses()) .orderByDesc(IconGroup::getCreateAt) .list(); return BeanMapper.copyList(iconGroups, IconGroupListResp.class); } + + /** + * 查询图标组详情 + * + * @param id 图标组id + * @return 图标组详情 + */ + @Override + public IconGroupListResp detailById(Long id) { + return BeanMapper.copyBean(iconGroupRepository.getById(id), IconGroupListResp.class); + } } diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailAddReq.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailAddReq.java index 5139831..bcc12d3 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailAddReq.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailAddReq.java @@ -1,6 +1,7 @@ package cn.axzo.oss.client.icon.vo.request; import cn.axzo.oss.client.icon.annotation.IsJsonString; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import lombok.AllArgsConstructor; import lombok.Builder; @@ -11,6 +12,7 @@ import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; +import java.util.Map; /** * @author chenwenjian @@ -65,7 +67,6 @@ public class IconDetailAddReq { /** * 扩展信息（json） */ - @IsJsonString(message = "扩展信息格式不正确") - private String ext; + private Map ext; } diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailUpdateReq.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailUpdateReq.java index 6692cda..4cac8b1 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailUpdateReq.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailUpdateReq.java @@ -1,6 +1,7 @@ package cn.axzo.oss.client.icon.vo.request; import cn.axzo.oss.client.icon.annotation.IsJsonString; +import com.alibaba.fastjson.JSONObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -9,6 +10,7 @@ import lombok.NoArgsConstructor; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.util.Map; /** * @author chenwenjian @@ -42,6 +44,5 @@ public class IconDetailUpdateReq { /** * 扩展信息（json） */ - @IsJsonString(message = "扩展信息格式不正确") - private String ext; + private Map ext; } diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupAddReq.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupAddReq.java index b1a7412..1804303 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupAddReq.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupAddReq.java @@ -1,6 +1,7 @@ package cn.axzo.oss.client.icon.vo.request; import cn.axzo.oss.client.icon.annotation.IsJsonString; +import com.alibaba.fastjson.JSONObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -34,7 +35,6 @@ public class IconGroupAddReq { /** * 扩展信息（json） */ - @IsJsonString(message = "扩展信息格式不正确") - private String ext; + private JSONObject ext; } diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupUpdateReq.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupUpdateReq.java index c17677e..55e798c 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupUpdateReq.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconGroupUpdateReq.java @@ -1,12 +1,15 @@ package cn.axzo.oss.client.icon.vo.request; import cn.axzo.oss.client.icon.annotation.IsJsonString; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import javax.validation.constraints.NotBlank; +import java.util.Map; /** * @author chenwenjian @@ -33,6 +36,5 @@ public class IconGroupUpdateReq { /** * 扩展信息（json） */ - @IsJsonString(message = "扩展信息格式不正确") - private String ext; + private Map ext; } diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconDetailListResp.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconDetailListResp.java index 74c05a5..cb150a7 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconDetailListResp.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconDetailListResp.java @@ -1,5 +1,6 @@ package cn.axzo.oss.client.icon.vo.response; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconGroupListResp.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconGroupListResp.java index bf4477d..cbf09ca 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconGroupListResp.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconGroupListResp.java @@ -1,5 +1,6 @@ package cn.axzo.oss.client.icon.vo.response; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/oss-common/src/main/java/cn/axzo/oss/common/enums/CodeEnum.java b/oss-common/src/main/java/cn/axzo/oss/common/enums/CodeEnum.java index a52c44b..0bd21b9 100644 --- a/oss-common/src/main/java/cn/axzo/oss/common/enums/CodeEnum.java +++ b/oss-common/src/main/java/cn/axzo/oss/common/enums/CodeEnum.java @@ -49,7 +49,8 @@ public enum CodeEnum implements EnumBase { MULTIPART_UPLOAD_COMPLETE_ERROR(115, "文件上传失败"), ICON_GROUP_EXIST(116, "图标组已存在"), - ICON_EXIST(117, "图标已存在") + ICON_GROUP_NOT_EXIST(117, "图标组不存在"), + ICON_EXIST(118, "图标已存在") ; From 9d2e3067fc473148d1d113c98e0fcf119916e7c9 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Tue, 26 Dec 2023 10:26:47 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat(icon=5Fmanage):=20=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3=EF=BC=88?= =?UTF-8?q?=E4=B8=8D=E9=89=B4=E6=9D=83=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IconFileUploadController.java | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconFileUploadController.java diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconFileUploadController.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconFileUploadController.java new file mode 100644 index 0000000..3514a5f --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconFileUploadController.java @@ -0,0 +1,69 @@ +package cn.axzo.oss.client.icon.controller; + +import cn.axzo.oss.client.vo.FileInformationVo; +import cn.axzo.oss.common.exception.BizException; +import cn.axzo.oss.common.utils.BeanConvertUtil; +import cn.axzo.oss.manager.api.dto.request.ServerFileUploadDto; +import cn.axzo.oss.manager.api.dto.response.FileInformationResponse; +import cn.axzo.oss.service.api.FileService; +import cn.azxo.framework.common.model.CommonResponse; +import lombok.SneakyThrows; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.validation.Valid; + +import static cn.axzo.oss.common.enums.CodeEnum.FILE_NAME_TOO_LONG; +import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE; + +/** + * 图标上传管理 + * + * @author chenwenjian + * @version 1.0 + * @date 2023/12/26 10:01 + */ +@RestController +@RequestMapping("/icon") +public class IconFileUploadController { + + private static int FILE_NAME_MAX_LENGTH = 128; + @Resource + private FileService fileService; + + /** + * 图标上传管理 + * + * @param appCode 应用码 （oss提供） 此处使用app + * @param bizScene 业务场景 （在oss服务中配置） 此处使用app + * @param serviceName 调用方服务名 此处使用web + * @param file 文件 + * @return {@link FileInformationVo} + */ + @PostMapping(value = "/fileUpload", consumes = MULTIPART_FORM_DATA_VALUE) + @CrossOrigin + @SneakyThrows + public CommonResponse uploadV2(@Valid @RequestParam("appCode") String appCode, + @Valid @RequestParam("bizScene") String bizScene, + @Valid @RequestParam("serviceName") String serviceName, + @Valid @RequestPart MultipartFile file) { + + String filename = file.getOriginalFilename(); + BizException.error(filename.length() < FILE_NAME_MAX_LENGTH, FILE_NAME_TOO_LONG); + ServerFileUploadDto fileUploadDto = ServerFileUploadDto.builder() + .appCode(appCode) + .bizScene(bizScene) + .fileName(filename) + .fileContent(file.getBytes()) + .build(); + FileInformationResponse response = fileService.uploadV2(serviceName, fileUploadDto, null); + FileInformationVo result = BeanConvertUtil.copyBean(response, FileInformationVo.class); + return CommonResponse.success(result); + } +} From 744294cd216d55a89be91599a1fccd9f90263251 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Tue, 26 Dec 2023 13:57:19 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat(icon=5Fmanage):=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=AE=9E=E4=BD=93=E7=B1=BBsize=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/axzo/oss/client/icon/entity/IconDetail.java | 4 ++-- .../axzo/oss/client/icon/vo/request/IconDetailAddReq.java | 7 +++---- .../oss/client/icon/vo/response/IconDetailListResp.java | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconDetail.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconDetail.java index 8b53227..1835606 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconDetail.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconDetail.java @@ -52,10 +52,10 @@ public class IconDetail extends Model { private String url; /** - * 图标存储大小，单位KB + * 图标存储大小 */ @TableField("size") - private Double size; + private String size; /** * 尺寸-宽，单位mm diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailAddReq.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailAddReq.java index bcc12d3..92ad9ec 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailAddReq.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailAddReq.java @@ -44,11 +44,10 @@ public class IconDetailAddReq { private String url; /** - * 图标存储大小，单位KB + * 图标存储大小 */ - @Min(value = 0, message = "图标存储大小不能小于0") - @NotNull(message = "图标存储大小不能为空") - private Double size; + @NotBlank(message = "图标存储大小不能为空") + private String size; /** * 尺寸-宽，单位mm@ diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconDetailListResp.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconDetailListResp.java index cb150a7..fd930cd 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconDetailListResp.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconDetailListResp.java @@ -53,7 +53,7 @@ public class IconDetailListResp { /** * 图标存储大小，单位KB */ - private Double size; + private String size; /** * 尺寸-宽，单位mm From 4a1861d227068744a681d481eb897c99362a04b0 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Wed, 27 Dec 2023 10:48:23 +0800 Subject: [PATCH 5/8] =?UTF-8?q?feat(icon=5Fmanage):=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8D=E8=BF=9B=E8=A1=8C=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=80=92=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java | 1 - .../axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java | 1 - 2 files changed, 2 deletions(-) diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java index 4d305aa..8b36767 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java @@ -145,7 +145,6 @@ public class IconDetailServiceImpl implements IconDetailService { .in(!CollectionUtils.isEmpty(req.getIds()), IconDetail::getId, req.getIds()) .like(StringUtils.hasText(req.getName()), IconDetail::getName, req) .in(!CollectionUtils.isEmpty(req.getStatuses()), IconDetail::getStatus, req.getStatuses()) - .orderByDesc(IconDetail::getCreateAt) .list(); if (CollectionUtils.isEmpty(iconDetailList)) { return Collections.emptyList(); diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java index 4976190..24dfe20 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java @@ -119,7 +119,6 @@ public class IconGroupServiceImpl implements IconGroupService { .in(!CollectionUtils.isEmpty(req.getTerminals()), IconGroup::getTerminal, req.getTerminals()) .in(!CollectionUtils.isEmpty(req.getGroups()), IconGroup::getGroup, req.getGroups()) .in(!CollectionUtils.isEmpty(req.getStatuses()), IconGroup::getStatus, req.getStatuses()) - .orderByDesc(IconGroup::getCreateAt) .list(); return BeanMapper.copyList(iconGroups, IconGroupListResp.class); } From 0638c168374f799fea7b303fc0221c4896591cc0 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Wed, 27 Dec 2023 10:49:41 +0800 Subject: [PATCH 6/8] =?UTF-8?q?feat(icon=5Fmanage):=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oss/client/icon/service/impl/IconDetailServiceImpl.java | 4 ---- .../oss/client/icon/service/impl/IconGroupServiceImpl.java | 1 - 2 files changed, 5 deletions(-) diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java index 8b36767..e15235f 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java @@ -3,7 +3,6 @@ package cn.axzo.oss.client.icon.service.impl; import cn.axzo.basics.common.BeanMapper; import cn.axzo.oss.client.icon.entity.IconDetail; import cn.axzo.oss.client.icon.entity.IconGroup; -import cn.axzo.oss.client.icon.mapper.IconDetailMapper; import cn.axzo.oss.client.icon.repository.IconDetailRepository; import cn.axzo.oss.client.icon.repository.IconGroupRepository; import cn.axzo.oss.client.icon.service.IconDetailService; @@ -21,13 +20,10 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.function.BiConsumer; -import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java index 24dfe20..578723a 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconGroupServiceImpl.java @@ -21,7 +21,6 @@ import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Objects; -import java.util.function.BiConsumer; /** * @author chenwenjian From ece9bdf777982feb7d3fdcd59a17e12fdcbe1850 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Mon, 11 Mar 2024 14:16:21 +0800 Subject: [PATCH 7/8] =?UTF-8?q?feat(icon=5Fmanage):=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=9B=BE=E6=A0=87=E7=B1=BB=E5=9E=8B=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../icon/controller/IconDetailController.java | 15 +++++++ .../oss/client/icon/entity/IconDetail.java | 6 +++ .../icon/service/IconDetailService.java | 9 +++++ .../service/impl/IconDetailServiceImpl.java | 40 ++++++++++++++++++- .../icon/vo/request/IconDetailListReq.java | 5 +++ .../icon/vo/request/IconTypeListReq.java | 27 +++++++++++++ .../icon/vo/response/IconDetailListResp.java | 5 +++ .../cn/axzo/oss/common/enums/CodeEnum.java | 3 +- 8 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconTypeListReq.java diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconDetailController.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconDetailController.java index 59089ab..035caec 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconDetailController.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/controller/IconDetailController.java @@ -5,8 +5,10 @@ import cn.axzo.oss.client.icon.vo.request.IconDetailAddReq; import cn.axzo.oss.client.icon.vo.request.IconDetailListReq; import cn.axzo.oss.client.icon.vo.request.IconDetailUpdateReq; import cn.axzo.oss.client.icon.vo.request.IconDetailUpdateStatus; +import cn.axzo.oss.client.icon.vo.request.IconTypeListReq; import cn.axzo.oss.client.icon.vo.response.IconDetailListResp; import cn.azxo.framework.common.model.CommonResponse; +import cn.hutool.json.JSONNull; import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -92,6 +94,19 @@ public class IconDetailController { */ @PostMapping("/list") public CommonResponse> list(@RequestBody IconDetailListReq req) { + log.info("图标列表：req = {}", JSONUtil.toJsonStr(req)); return CommonResponse.success(iconDetailService.list(req)); } + + /** + * 获取所有图标文件格式 + * + * @param req 图标信息 {@link IconTypeListReq} + * @return 图标文件格式列表 + */ + @PostMapping("/getAllTypes") + public CommonResponse> getAllTypes(@RequestBody IconTypeListReq req) { + log.info("获取所有图标文件格式：req = {}", JSONUtil.toJsonStr(req)); + return CommonResponse.success(iconDetailService.getAllTypes(req)); + } } diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconDetail.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconDetail.java index 1835606..6cc890e 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconDetail.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/entity/IconDetail.java @@ -45,6 +45,12 @@ public class IconDetail extends Model { @TableField("name") private String name; + /** + * 图标类型 + */ + @TableField("type") + private String type; + /** * 图标地址 */ diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconDetailService.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconDetailService.java index a653881..e76567c 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconDetailService.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/IconDetailService.java @@ -4,6 +4,7 @@ import cn.axzo.oss.client.icon.vo.request.IconDetailAddReq; import cn.axzo.oss.client.icon.vo.request.IconDetailListReq; import cn.axzo.oss.client.icon.vo.request.IconDetailUpdateReq; import cn.axzo.oss.client.icon.vo.request.IconDetailUpdateStatus; +import cn.axzo.oss.client.icon.vo.request.IconTypeListReq; import cn.axzo.oss.client.icon.vo.response.IconDetailListResp; import java.util.List; @@ -55,4 +56,12 @@ public interface IconDetailService { * @return 图标详情 */ IconDetailListResp detailById(Long id); + + /** + * 获取所有图标类型 + * + * @param req 图标类型请求 {@link IconTypeListReq} + * @return 图标类型 + */ + List getAllTypes(IconTypeListReq req); } diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java index e15235f..c3d7616 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java @@ -1,6 +1,7 @@ package cn.axzo.oss.client.icon.service.impl; import cn.axzo.basics.common.BeanMapper; +import cn.axzo.basics.common.exception.ServiceException; import cn.axzo.oss.client.icon.entity.IconDetail; import cn.axzo.oss.client.icon.entity.IconGroup; import cn.axzo.oss.client.icon.repository.IconDetailRepository; @@ -9,9 +10,11 @@ import cn.axzo.oss.client.icon.service.IconDetailService; import cn.axzo.oss.client.icon.vo.request.IconDetailAddReq; import cn.axzo.oss.client.icon.vo.request.IconDetailListReq; import cn.axzo.oss.client.icon.vo.request.IconDetailUpdateReq; +import cn.axzo.oss.client.icon.vo.request.IconTypeListReq; import cn.axzo.oss.client.icon.vo.response.IconDetailListResp; import cn.axzo.oss.common.enums.CodeEnum; import cn.axzo.oss.common.exception.BizException; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -20,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; @@ -66,7 +70,15 @@ public class IconDetailServiceImpl implements IconDetailService { .one(); // 存在 BizException.error(Objects.isNull(iconDetail), CodeEnum.ICON_EXIST); - return iconDetailRepository.save(BeanMapper.copyBean(req, IconDetail.class, (r, i) -> i.setExt(JSONUtil.toJsonStr(r.getExt())))); + return iconDetailRepository.save(BeanMapper.copyBean(req, IconDetail.class, (r, i) -> { + i.setExt(JSONUtil.toJsonStr(r.getExt())); + // 获取图标格式 + String[] split = r.getName().split("\\."); + if (ArrayUtil.isEmpty(split)){ + throw new ServiceException(CodeEnum.FILE_FORMAT_MAY_ERROR.getMessage()); + } + i.setType(split[split.length-1].toLowerCase()); + })); } /** @@ -140,6 +152,9 @@ public class IconDetailServiceImpl implements IconDetailService { .in(!CollectionUtils.isEmpty(req.getGroupIds()), IconDetail::getGroupId, req.getGroupIds()) .in(!CollectionUtils.isEmpty(req.getIds()), IconDetail::getId, req.getIds()) .like(StringUtils.hasText(req.getName()), IconDetail::getName, req) + .in(!CollectionUtils.isEmpty(req.getTypes()), IconDetail::getType, req.getTypes().stream() + .map(e -> e.trim().toLowerCase()) + .collect(Collectors.toList())) .in(!CollectionUtils.isEmpty(req.getStatuses()), IconDetail::getStatus, req.getStatuses()) .list(); if (CollectionUtils.isEmpty(iconDetailList)) { @@ -183,4 +198,27 @@ public class IconDetailServiceImpl implements IconDetailService { r.setGroupName(iconGroup.getGroup()); }); } + + /** + * 获取图标所有类型 + * + * @param req 查询参数 {@link IconTypeListReq} + * @return 所有类型 {@link List} + */ + @Override + public List getAllTypes(IconTypeListReq req) { + List iconDetailList = iconDetailRepository.lambdaQuery() + .eq(IconDetail::getIsDelete, 0) + .in(!CollectionUtils.isEmpty(req.getGroupIds()), IconDetail::getGroupId, req.getGroupIds().stream() + .distinct() + .collect(Collectors.toList())) + .list(); + if (CollectionUtils.isEmpty(iconDetailList)) { + return Collections.emptyList(); + } + return iconDetailList.stream() + .map(IconDetail::getType) + .distinct() + .collect(Collectors.toList()); + } } diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailListReq.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailListReq.java index fe3cbc1..e334174 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailListReq.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconDetailListReq.java @@ -33,6 +33,11 @@ public class IconDetailListReq { */ private String name; + /** + * 类型，如：svg，png，多个用逗号分隔 + */ + private List types; + /** * 状态，0：正常，1：禁用，多个用逗号分隔 */ diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconTypeListReq.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconTypeListReq.java new file mode 100644 index 0000000..9538050 --- /dev/null +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/request/IconTypeListReq.java @@ -0,0 +1,27 @@ +package cn.axzo.oss.client.icon.vo.request; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 图标类型列表请求 + * @author chenwenjian + * @version 1.0 + * @date 2024/3/11 10:39 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class IconTypeListReq { + + /** + * 分组ID，多个用逗号分隔 + */ + private List groupIds; + +} diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconDetailListResp.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconDetailListResp.java index fd930cd..a58dfe6 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconDetailListResp.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/vo/response/IconDetailListResp.java @@ -45,6 +45,11 @@ public class IconDetailListResp { */ private String name; + /** + * 图标类型，如svg，png + */ + private String type; + /** * 图标地址 */ diff --git a/oss-common/src/main/java/cn/axzo/oss/common/enums/CodeEnum.java b/oss-common/src/main/java/cn/axzo/oss/common/enums/CodeEnum.java index 0bd21b9..bcc2e4a 100644 --- a/oss-common/src/main/java/cn/axzo/oss/common/enums/CodeEnum.java +++ b/oss-common/src/main/java/cn/axzo/oss/common/enums/CodeEnum.java @@ -50,7 +50,8 @@ public enum CodeEnum implements EnumBase { ICON_GROUP_EXIST(116, "图标组已存在"), ICON_GROUP_NOT_EXIST(117, "图标组不存在"), - ICON_EXIST(118, "图标已存在") + ICON_EXIST(118, "图标已存在"), + FILE_FORMAT_MAY_ERROR(119, "文件格式可能错误") ; From b64a8241fff8540b053ccc9c19e7a88ab4ee7569 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Tue, 12 Mar 2024 09:47:08 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feat(icon=5Fmanage):=20=E5=9B=BE=E6=A0=87li?= =?UTF-8?q?st=E6=8E=A5=E5=8F=A3NPE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../icon/service/impl/IconDetailServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java index c3d7616..e430763 100644 --- a/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java +++ b/oss-client/src/main/java/cn/axzo/oss/client/icon/service/impl/IconDetailServiceImpl.java @@ -146,15 +146,19 @@ public class IconDetailServiceImpl implements IconDetailService { */ @Override public List list(IconDetailListReq req) { + List finalTypes = null; + if (!CollectionUtils.isEmpty(req.getTypes())) { + finalTypes = req.getTypes().stream() + .map(e -> e.trim().toLowerCase()) + .collect(Collectors.toList()); + } // 查询图标列表 List iconDetailList = iconDetailRepository.lambdaQuery() .eq(IconDetail::getIsDelete, 0) .in(!CollectionUtils.isEmpty(req.getGroupIds()), IconDetail::getGroupId, req.getGroupIds()) .in(!CollectionUtils.isEmpty(req.getIds()), IconDetail::getId, req.getIds()) .like(StringUtils.hasText(req.getName()), IconDetail::getName, req) - .in(!CollectionUtils.isEmpty(req.getTypes()), IconDetail::getType, req.getTypes().stream() - .map(e -> e.trim().toLowerCase()) - .collect(Collectors.toList())) + .in(!CollectionUtils.isEmpty(finalTypes), IconDetail::getType, finalTypes) .in(!CollectionUtils.isEmpty(req.getStatuses()), IconDetail::getStatus, req.getStatuses()) .list(); if (CollectionUtils.isEmpty(iconDetailList)) {