From d3d061d7828dc9e07a2af7a617c82e8d979b4767 Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Wed, 25 Oct 2023 18:38:22 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0a=E7=AB=AFapi?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/common/CommonConstants.java | 7 ++--- .../domain/dto/sm/SaveApiGuideDTO.java | 27 +++++++++++++++++++ .../domain/dto/sm/SaveApiMenuDTO.java | 24 +++++++++++++++++ .../domain/dto/sm/UpdateApiGuideDTO.java | 26 ++++++++++++++++++ .../domain/dto/sm/UpdateApiMenuDTO.java | 24 +++++++++++++++++ .../com/iformall/domain/po/sm/ApiGuide.java | 4 +-- .../com/iformall/domain/po/sm/ApiMenu.java | 6 ++--- .../com/iformall/mapper/ApiGuideMapper.java | 3 +++ .../com/iformall/mapper/ApiMenuMapper.java | 3 +++ .../service/sm/impl/ApiDetailServiceImpl.java | 6 +++-- .../service/sm/impl/ApiGuideServiceImpl.java | 16 +++++++---- .../service/sm/impl/ApiMenuServiceImpl.java | 16 +++++++---- .../sm/impl/ServiceInfoServiceImpl.java | 2 +- .../main/resources/mapper/ApiGuideMapper.xml | 20 ++++++++++++++ .../main/resources/mapper/ApiMenuMapper.xml | 23 ++++++++++++++++ 15 files changed, 186 insertions(+), 21 deletions(-) diff --git a/suimangService/src/main/java/com/iformall/common/CommonConstants.java b/suimangService/src/main/java/com/iformall/common/CommonConstants.java index fe8ad85..13b67b0 100644 --- a/suimangService/src/main/java/com/iformall/common/CommonConstants.java +++ b/suimangService/src/main/java/com/iformall/common/CommonConstants.java @@ -8,8 +8,9 @@ public interface CommonConstants { Integer STATUS_ABNORMAL = 1; /** - * 删除状态(0:未删除,1:已删除) + * 是否:0:否,1:是 + * 是否删除状态(0:未删除,1:已删除) */ - Integer DEL_FLAG_DELETED = 1; - Integer DEL_FLAG_NORMAL = 0; + Integer FLAG_TRUE = 1; + Integer FLAG_FALSE = 0; } diff --git a/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiGuideDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiGuideDTO.java index 48edffd..5e86ffa 100644 --- a/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiGuideDTO.java +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiGuideDTO.java @@ -1,9 +1,36 @@ package com.iformall.domain.dto.sm; +import com.iformall.common.CommonConstants; +import com.iformall.common.IdWorker; +import com.iformall.domain.po.sm.ApiGuide; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @ApiModel(value = "新增API指南") @Data public class SaveApiGuideDTO { + @ApiModelProperty("api名称") + private String name; + @ApiModelProperty("指南内容") + private String content; + @ApiModelProperty("状态(0:正常,1:锁定)") + private Integer status; + + public static ApiGuide mapping(SaveApiGuideDTO dto) { + ApiGuide apiGuide = new ApiGuide(); + apiGuide.setId(IdWorker.get().nextId()); + apiGuide.setCreateTime(new Date()); + apiGuide.setUpdateTime(new Date()); + if (CommonConstants.STATUS_NORMAL.equals(dto.getStatus())) { + apiGuide.setReleaseTime(new Date()); + } + apiGuide.setName(dto.getName()); + apiGuide.setContent(dto.getContent()); + apiGuide.setStatus(dto.getStatus()); + apiGuide.setDeleteFlag(CommonConstants.FLAG_FALSE); + return apiGuide; + } } diff --git a/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiMenuDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiMenuDTO.java index c4b2140..c4cb19e 100644 --- a/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiMenuDTO.java +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/SaveApiMenuDTO.java @@ -1,9 +1,33 @@ package com.iformall.domain.dto.sm; +import com.iformall.common.CommonConstants; +import com.iformall.common.IdWorker; +import com.iformall.domain.po.sm.ApiMenu; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @ApiModel(value = "新增API菜单") @Data public class SaveApiMenuDTO { + @ApiModelProperty("菜单名称") + private String name; + @ApiModelProperty("父菜单id") + private Long parentId; + @ApiModelProperty("状态(0:正常,1:锁定)") + private Integer status; + + public static ApiMenu mapping(SaveApiMenuDTO dto) { + ApiMenu apiMenu = new ApiMenu(); + apiMenu.setId(IdWorker.get().nextId()); + apiMenu.setCreateTime(new Date()); + apiMenu.setUpdateTime(new Date()); + apiMenu.setName(dto.getName()); + apiMenu.setParentId(dto.getParentId()); + apiMenu.setStatus(dto.getStatus()); + apiMenu.setDeleteFlag(CommonConstants.FLAG_FALSE); + return apiMenu; + } } diff --git a/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiGuideDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiGuideDTO.java index 58986e2..ca80d9a 100644 --- a/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiGuideDTO.java +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiGuideDTO.java @@ -1,9 +1,35 @@ package com.iformall.domain.dto.sm; +import com.iformall.common.CommonConstants; +import com.iformall.common.IdWorker; +import com.iformall.domain.po.sm.ApiGuide; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @ApiModel(value = "修改API指南") @Data public class UpdateApiGuideDTO { + @ApiModelProperty("id") + private Long id; + @ApiModelProperty("api名称") + private String name; + @ApiModelProperty("指南内容") + private String content; + @ApiModelProperty("状态(0:正常,1:锁定)") + private Integer status; + + public static ApiGuide mapping(UpdateApiGuideDTO dto) { + ApiGuide apiGuide = new ApiGuide(); + apiGuide.setUpdateTime(new Date()); + if (CommonConstants.STATUS_NORMAL.equals(dto.getStatus())) { + apiGuide.setReleaseTime(new Date()); + } + apiGuide.setName(dto.getName()); + apiGuide.setContent(dto.getContent()); + apiGuide.setStatus(dto.getStatus()); + return apiGuide; + } } diff --git a/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiMenuDTO.java b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiMenuDTO.java index c8e530b..d16354d 100644 --- a/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiMenuDTO.java +++ b/suimangService/src/main/java/com/iformall/domain/dto/sm/UpdateApiMenuDTO.java @@ -1,9 +1,33 @@ package com.iformall.domain.dto.sm; +import com.iformall.common.CommonConstants; +import com.iformall.common.IdWorker; +import com.iformall.domain.po.sm.ApiMenu; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @ApiModel(value = "修改API菜单") @Data public class UpdateApiMenuDTO { + @ApiModelProperty("id") + private Long id; + @ApiModelProperty("菜单名称") + private String name; + @ApiModelProperty("父菜单id") + private Long parentId; + @ApiModelProperty("状态(0:正常,1:锁定)") + private Integer status; + + public static ApiMenu mapping(UpdateApiMenuDTO dto) { + ApiMenu apiMenu = new ApiMenu(); + apiMenu.setId(dto.getId()); + apiMenu.setUpdateTime(new Date()); + apiMenu.setName(dto.getName()); + apiMenu.setParentId(dto.getParentId()); + apiMenu.setStatus(dto.getStatus()); + return apiMenu; + } } diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiGuide.java b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiGuide.java index bd47c7a..2598ccc 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiGuide.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiGuide.java @@ -49,12 +49,12 @@ public class ApiGuide implements Serializable { /** * 状态(0:正常,1:锁定) */ - private Byte status; + private Integer status; /** * 删除(0:未删除,1:删除) */ - private Byte deleteFlag; + private Integer deleteFlag; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java index 935394f..ab94f22 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java @@ -44,17 +44,17 @@ public class ApiMenu implements Serializable { /** * 状态(0:正常,1:锁定) */ - private Byte status; + private Integer status; /** * 是否叶子节点(0:否,1:是) */ - private Byte leafFlag; + private Integer leafFlag; /** * 是否删除(0:未删除,1:删除) */ - private Byte deleteFlag; + private Integer deleteFlag; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/suimangService/src/main/java/com/iformall/mapper/ApiGuideMapper.java b/suimangService/src/main/java/com/iformall/mapper/ApiGuideMapper.java index f981249..42a1d0d 100644 --- a/suimangService/src/main/java/com/iformall/mapper/ApiGuideMapper.java +++ b/suimangService/src/main/java/com/iformall/mapper/ApiGuideMapper.java @@ -3,11 +3,14 @@ package com.iformall.mapper; import com.iformall.domain.po.sm.ApiGuide; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** * @Entity com.iformall.domain.po.sm.ApiGuide */ public interface ApiGuideMapper extends BaseMapper { + List listApiGuide(ApiGuide apiGuide); } diff --git a/suimangService/src/main/java/com/iformall/mapper/ApiMenuMapper.java b/suimangService/src/main/java/com/iformall/mapper/ApiMenuMapper.java index bf1ef67..1a95553 100644 --- a/suimangService/src/main/java/com/iformall/mapper/ApiMenuMapper.java +++ b/suimangService/src/main/java/com/iformall/mapper/ApiMenuMapper.java @@ -3,11 +3,14 @@ package com.iformall.mapper; import com.iformall.domain.po.sm.ApiMenu; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** * @Entity com.iformall.domain.po.sm.ApiMenu */ public interface ApiMenuMapper extends BaseMapper { + List listApiMenu(ApiMenu apiMenu); } diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiDetailServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiDetailServiceImpl.java index a62b5f0..f1ae80a 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiDetailServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiDetailServiceImpl.java @@ -4,14 +4,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.iformall.domain.po.sm.ApiDetail; import com.iformall.service.sm.ApiDetailService; import com.iformall.mapper.ApiDetailMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** * */ @Service -public class ApiDetailServiceImpl extends ServiceImpl - implements ApiDetailService{ +public class ApiDetailServiceImpl extends ServiceImpl implements ApiDetailService{ + @Autowired + private ApiDetailMapper apiDetailMapper; @Override public ApiDetail getApiDetail(Long id) { diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiGuideServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiGuideServiceImpl.java index 24f91a6..b008973 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiGuideServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiGuideServiceImpl.java @@ -1,34 +1,40 @@ package com.iformall.service.sm.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.dto.sm.SaveApiGuideDTO; import com.iformall.domain.dto.sm.UpdateApiGuideDTO; import com.iformall.domain.po.sm.ApiGuide; import com.iformall.service.sm.ApiGuideService; import com.iformall.mapper.ApiGuideMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** * */ @Service -public class ApiGuideServiceImpl extends ServiceImpl - implements ApiGuideService{ +public class ApiGuideServiceImpl extends ServiceImpl implements ApiGuideService{ + + @Autowired + private ApiGuideMapper apiGuideMapper; @Override public PageInfo pageApiGuide(ApiGuide apiGuide, Integer pageNum, Integer pageSize) { - return null; + return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> apiGuideMapper.listApiGuide(apiGuide)); } @Override public void saveApiGuide(SaveApiGuideDTO dto) { - + ApiGuide apiGuide = SaveApiGuideDTO.mapping(dto); + apiGuideMapper.insert(apiGuide); } @Override public void updateApiGuide(UpdateApiGuideDTO dto) { - + ApiGuide apiGuide = UpdateApiGuideDTO.mapping(dto); + apiGuideMapper.updateById(apiGuide); } } diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiMenuServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiMenuServiceImpl.java index 57ceac1..ff066a6 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiMenuServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiMenuServiceImpl.java @@ -1,34 +1,40 @@ package com.iformall.service.sm.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.dto.sm.SaveApiMenuDTO; import com.iformall.domain.dto.sm.UpdateApiMenuDTO; import com.iformall.domain.po.sm.ApiMenu; import com.iformall.service.sm.ApiMenuService; import com.iformall.mapper.ApiMenuMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** * */ @Service -public class ApiMenuServiceImpl extends ServiceImpl - implements ApiMenuService{ +public class ApiMenuServiceImpl extends ServiceImpl implements ApiMenuService{ + + @Autowired + private ApiMenuMapper apiMenuMapper; @Override public PageInfo pageApiMenu(ApiMenu apiMenu, Integer pageNum, Integer pageSize) { - return null; + return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> apiMenuMapper.listApiMenu(apiMenu)); } @Override public void saveApiMenu(SaveApiMenuDTO dto) { - + ApiMenu apiMenu = SaveApiMenuDTO.mapping(dto); + apiMenuMapper.insert(apiMenu); } @Override public void updateApiMenu(UpdateApiMenuDTO dto) { - + ApiMenu apiMenu = UpdateApiMenuDTO.mapping(dto); + apiMenuMapper.updateById(apiMenu); } } diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java index 93e0233..4aea26b 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/ServiceInfoServiceImpl.java @@ -33,7 +33,7 @@ public class ServiceInfoServiceImpl implements ServiceInfoService { public void saveServiceInfo(SaveServiceInfoDTO dto) { // 校验 ServiceInfo serviceInfo = serviceInfoMapper.selectOne(new LambdaQueryWrapper() - .eq(ServiceInfo::getDelFlag, CommonConstants.DEL_FLAG_NORMAL) + .eq(ServiceInfo::getDelFlag, CommonConstants.FLAG_FALSE) .eq(ServiceInfo::getCode, dto.getCode())); if (serviceInfo != null) { throw new BizException(ErrorCode.CODE_ALREADY_EXISTS); diff --git a/suimangService/src/main/resources/mapper/ApiGuideMapper.xml b/suimangService/src/main/resources/mapper/ApiGuideMapper.xml index 722d546..b583099 100644 --- a/suimangService/src/main/resources/mapper/ApiGuideMapper.xml +++ b/suimangService/src/main/resources/mapper/ApiGuideMapper.xml @@ -20,4 +20,24 @@ release_time,name,content, status,delete_flag + + + WHERE 1 = 1 + + and `id` = #{id} + + + and `name` = #{name} + + + and `status = #{status} + + + + diff --git a/suimangService/src/main/resources/mapper/ApiMenuMapper.xml b/suimangService/src/main/resources/mapper/ApiMenuMapper.xml index ae90892..a3810cf 100644 --- a/suimangService/src/main/resources/mapper/ApiMenuMapper.xml +++ b/suimangService/src/main/resources/mapper/ApiMenuMapper.xml @@ -20,4 +20,27 @@ name,parent_id,status, leaf_flag,delete_flag + + + WHERE 1 = 1 + + and `id` = #{id} + + + and `parent_id` = #{parentId} + + + and `name` = #{name} + + + and `status = #{status} + + + +