From 4c6d33591227e11df5315db98efcd91554ade576 Mon Sep 17 00:00:00 2001 From: LiZi <2954265606@qq.com> Date: Mon, 25 Dec 2023 18:52:44 +0800 Subject: [PATCH] =?UTF-8?q?my=E6=9C=80=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../srt/controller/ApiConfigController.java | 9 +- .../java/net/srt/convert/ApiLogConvert.java | 3 +- .../java/net/srt/entity/ApiConfigEntity.java | 2 + .../java/net/srt/mapper/ApiConfigDao.java | 2 +- .../java/net/srt/query/ApiConfigQuery.java | 1 + .../net/srt/service/ApiConfigService.java | 3 +- .../java/net/srt/service/ApiLogService.java | 1 - .../service/impl/ApiConfigServiceImpl.java | 17 ++- .../srt/service/impl/ApiGroupServiceImpl.java | 18 +-- .../srt/service/impl/ApiLogServiceImpl.java | 1 + .../src/main/java/net/srt/vo/ApiConfig.java | 104 +++++++++++++----- 11 files changed, 112 insertions(+), 49 deletions(-) diff --git a/srt-cloud-data-server/src/main/java/net/srt/controller/ApiConfigController.java b/srt-cloud-data-server/src/main/java/net/srt/controller/ApiConfigController.java index c84f33a..3cad1b4 100644 --- a/srt-cloud-data-server/src/main/java/net/srt/controller/ApiConfigController.java +++ b/srt-cloud-data-server/src/main/java/net/srt/controller/ApiConfigController.java @@ -20,6 +20,7 @@ import java.util.List; @RequestMapping("/api-config") @AllArgsConstructor public class ApiConfigController { + private final ApiConfigService apiConfigService; @@ -40,7 +41,7 @@ public class ApiConfigController { * @param query API配置查询对象 * @return 分页结果 */ - @GetMapping("page") + @GetMapping("/page") @Operation(summary = "分页") @PreAuthorize("hasAuthority('data-service:api-config:page')") public Result> page(@Valid ApiConfigQuery query) { @@ -54,7 +55,7 @@ public class ApiConfigController { * * @return 返回IP和端口信息 */ - @GetMapping("getIpPort") + @GetMapping("/getIpPort") public Result getIpPort() { return Result.ok(apiConfigService.getIpPort()); } @@ -109,8 +110,8 @@ public class ApiConfigController { @DeleteMapping @Operation(summary = "删除") @PreAuthorize("hasAuthority('data-service:api-config:delete')") - public Result delete(@PathVariable("id") Long id) { - apiConfigService.removeByI(id); + public Result delete(@RequestBody List idList) { + apiConfigService.removeByI(idList); return Result.ok(); } diff --git a/srt-cloud-data-server/src/main/java/net/srt/convert/ApiLogConvert.java b/srt-cloud-data-server/src/main/java/net/srt/convert/ApiLogConvert.java index c187daa..6399679 100644 --- a/srt-cloud-data-server/src/main/java/net/srt/convert/ApiLogConvert.java +++ b/srt-cloud-data-server/src/main/java/net/srt/convert/ApiLogConvert.java @@ -2,7 +2,8 @@ package net.srt.convert; import net.srt.entity.ApiLogEntity; import net.srt.vo.ApiLog; -import org.apache.ibatis.annotations.Mapper; + +import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; import java.util.List; diff --git a/srt-cloud-data-server/src/main/java/net/srt/entity/ApiConfigEntity.java b/srt-cloud-data-server/src/main/java/net/srt/entity/ApiConfigEntity.java index db43cc0..7b9dec0 100644 --- a/srt-cloud-data-server/src/main/java/net/srt/entity/ApiConfigEntity.java +++ b/srt-cloud-data-server/src/main/java/net/srt/entity/ApiConfigEntity.java @@ -1,6 +1,7 @@ package net.srt.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import net.srt.framework.mybatis.entity.BaseEntity; import org.springframework.data.annotation.CreatedDate; @@ -50,6 +51,7 @@ public class ApiConfigEntity extends BaseEntity { private Long releaseUserId; // 自定义注解，日期格式化，格式为"yyyy-MM-dd HH:mm:ss" @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date releaseTime; // 私有属性，内容类型 private String contentType; diff --git a/srt-cloud-data-server/src/main/java/net/srt/mapper/ApiConfigDao.java b/srt-cloud-data-server/src/main/java/net/srt/mapper/ApiConfigDao.java index 6919a9f..6ddc07f 100644 --- a/srt-cloud-data-server/src/main/java/net/srt/mapper/ApiConfigDao.java +++ b/srt-cloud-data-server/src/main/java/net/srt/mapper/ApiConfigDao.java @@ -9,6 +9,6 @@ import org.apache.ibatis.annotations.Param; public interface ApiConfigDao extends BaseDao { void xia(@Param("id") Long id); - void shang(Long id); + void shang(@Param("id") Long id); } diff --git a/srt-cloud-data-server/src/main/java/net/srt/query/ApiConfigQuery.java b/srt-cloud-data-server/src/main/java/net/srt/query/ApiConfigQuery.java index 4cbb148..a9631c1 100644 --- a/srt-cloud-data-server/src/main/java/net/srt/query/ApiConfigQuery.java +++ b/srt-cloud-data-server/src/main/java/net/srt/query/ApiConfigQuery.java @@ -5,6 +5,7 @@ import net.srt.framework.common.query.Query; @Data public class ApiConfigQuery extends Query { + private Long groupId; private Long resourceId; private Long appId; diff --git a/srt-cloud-data-server/src/main/java/net/srt/service/ApiConfigService.java b/srt-cloud-data-server/src/main/java/net/srt/service/ApiConfigService.java index 8b5d7ff..83335ce 100644 --- a/srt-cloud-data-server/src/main/java/net/srt/service/ApiConfigService.java +++ b/srt-cloud-data-server/src/main/java/net/srt/service/ApiConfigService.java @@ -29,9 +29,10 @@ public interface ApiConfigService extends BaseService { void shang(Long id); - void removeByI(Long id); void sav(ApiConfig vo); + void removeByI(List idList); + } diff --git a/srt-cloud-data-server/src/main/java/net/srt/service/ApiLogService.java b/srt-cloud-data-server/src/main/java/net/srt/service/ApiLogService.java index 70fca35..3404363 100644 --- a/srt-cloud-data-server/src/main/java/net/srt/service/ApiLogService.java +++ b/srt-cloud-data-server/src/main/java/net/srt/service/ApiLogService.java @@ -1,6 +1,5 @@ package net.srt.service; -import net.srt.entity.ApiGroupEntity; import net.srt.entity.ApiLogEntity; import net.srt.framework.common.page.PageResult; import net.srt.framework.mybatis.service.BaseService; diff --git a/srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiConfigServiceImpl.java b/srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiConfigServiceImpl.java index 56a1ea8..e17bf7c 100644 --- a/srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiConfigServiceImpl.java +++ b/srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiConfigServiceImpl.java @@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import srt.cloud.framework.dbswitch.common.util.StringUtil; +import javax.annotation.Resource; import java.util.List; @Service @@ -111,7 +112,7 @@ public class ApiConfigServiceImpl extends BaseServiceImpl idList) { + baseMapper.deleteBatchIds(idList); + } + private String recursionPath(ApiConfigEntity groupEntity, String path) { if (StringUtil.isBlank(path)) { path = groupEntity.getName(); diff --git a/srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiGroupServiceImpl.java b/srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiGroupServiceImpl.java index 1fd1973..bce878f 100644 --- a/srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiGroupServiceImpl.java +++ b/srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiGroupServiceImpl.java @@ -22,7 +22,7 @@ import java.util.List; @Service @AllArgsConstructor public class ApiGroupServiceImpl extends BaseServiceImpl implements ApiGroupService{ - private final ApiConfigService apiConfigService; +// private final ApiConfigService apiConfigService; @Override public List listTree() { List treeNodeVos = getTreeNodeVos(); @@ -81,13 +81,13 @@ public class ApiGroupServiceImpl extends BaseServiceImpl serviceApiConfigWrapper = new LambdaQueryWrapper<>(); - serviceApiConfigWrapper.eq(ApiConfigEntity::getParentId, id).last(" limit 1"); - ApiConfigEntity apiConfigEntity = apiConfigService.getOne(serviceApiConfigWrapper); - if (apiConfigEntity != null) { - throw new ServerException("节点下有 api 与之关联，不允许删除！"); - } - removeById(id); +// //查询有没有api与之关联 +// LambdaQueryWrapper serviceApiConfigWrapper = new LambdaQueryWrapper<>(); +// serviceApiConfigWrapper.eq(ApiConfigEntity::getParentId, id).last(" limit 1"); +// ApiConfigEntity apiConfigEntity = apiConfigService.getOne(serviceApiConfigWrapper); +// if (apiConfigEntity != null) { +// throw new ServerException("节点下有 api 与之关联，不允许删除！"); +// } +// removeById(id); } } diff --git a/srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiLogServiceImpl.java b/srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiLogServiceImpl.java index 58a6a9d..18e2019 100644 --- a/srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiLogServiceImpl.java +++ b/srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiLogServiceImpl.java @@ -35,6 +35,7 @@ public class ApiLogServiceImpl extends BaseServiceImpl // 调用Mapper层方法，查询分页数据 IPage page = baseMapper.selectPage(getPage(query), getWrapper(query)); + // 将查询结果转换为ApiConfig对象列表 // 返回分页结果 return new PageResult<>(ApiLogConvert.INSTANCE.convertList(page.getRecords()), page.getTotal()); diff --git a/srt-cloud-data-server/src/main/java/net/srt/vo/ApiConfig.java b/srt-cloud-data-server/src/main/java/net/srt/vo/ApiConfig.java index 9293809..73251a0 100644 --- a/srt-cloud-data-server/src/main/java/net/srt/vo/ApiConfig.java +++ b/srt-cloud-data-server/src/main/java/net/srt/vo/ApiConfig.java @@ -1,6 +1,10 @@ package net.srt.vo; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; @@ -14,38 +18,84 @@ import java.util.Date; @Data public class ApiConfig implements Serializable { private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) private Long id; - private Long groupId; - private String path; - private String type; + private Integer parentId; + private Integer type; private String name; - private String note; - private String sqlText; - private String sqlSeparator; - private Integer sqlMaxRow; - private String sqlParam; - private String jsonParam; - private String responseResult; - private Integer contentType; - private Integer status; - private Date releaseTime; - private Long releaseUserId; - private Integer sqlDbType; - private Long databaseId; - private Integer previlege; - private Integer openTrans; - private Long projectId; + private Integer orderNo; + private String description; + private String path; + private Integer projectId; private Integer version; private Integer deleted; - private Long creator; + private Integer creator; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; - private Long updater; + private Integer updater; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; - private Integer requestedTimes; - private Integer requestedSuccessTimes; - private Integer requestedFailedTimes; - private Long authId; - private String group; - private String groupPath; + private Integer status; + private String contentType; + private Integer releaseUserId; + private Date releaseTime; + private Integer previlege; + private Integer openTrans; + + + + + + + + + + + + + + + +// @TableId(value = "id", type = IdType.AUTO) +// private Long id; +// private Long groupId; +// private String path; +// private String type; +// private String name; +//// private String note; +// private String sqlText; +// private String sqlSeparator; +// private Integer sqlMaxRow; +// private String sqlParam; +// private String jsonParam; +// private String responseResult; +// private Integer contentType; +// private Integer status +// private Date releaseTime; +// private Long releaseUserId; +// private Integer sqlDbType; +// private Long databaseId; +// private Integer previlege; +// private Integer openTrans; +// private Long projectId; +// private Integer version; +// private Integer deleted; +// private Long creator; +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// private Date createTime; +// private Long updater; +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +// private Date updateTime; +// private Integer requestedTimes; +// private Integer requestedSuccessTimes; +// private Integer requestedFailedTimes; +// private Long authId; +// private String group; +// private String groupPath; }