From 68d232653b683698b859ca8228e36010dac168e0 Mon Sep 17 00:00:00 2001 From: fjj <–1066869486@qq.com> Date: Wed, 27 Dec 2023 22:04:27 +0800 Subject: [PATCH] fjj9.0 --- pom.xml | 3 +- .../.gitignore | 0 .../pom.xml | 46 +++-- .../main/java/net/srt/AssetsApplication.java | 11 +- .../src/main/resources/auth.yml | 0 .../src/main/resources/bootstrap.yml | 46 +++++ .../src/main/resources/log4j2.xml | 0 .../net/srt/init/BusinessInitializer.java | 8 +- .../main/java/net/srt/vo/DatastandardVO.java | 49 ----- ...lityConfigVO.java => QualityConfigVo.java} | 2 +- .../srt/controller/ApiConfigController.java | 119 ------------ .../srt/controller/ApiGroupController.java | 70 ------- .../main/java/net/srt/controller/ApiTest.java | 43 ----- .../net/srt/convert/ApiConfigConvert.java | 29 --- .../java/net/srt/convert/ApiGroupConvert.java | 26 --- .../java/net/srt/convert/ApiLogConvert.java | 26 --- .../main/java/net/srt/dto/ApiConfigDto.java | 49 ----- .../java/net/srt/entity/ApiConfigEntity.java | 61 ------- .../java/net/srt/entity/ApiGroupEntity.java | 41 ----- .../java/net/srt/entity/ApiLogEntity.java | 31 ---- .../java/net/srt/mapper/ApiConfigDao.java | 14 -- .../main/java/net/srt/mapper/ApiGroupDao.java | 9 - .../main/java/net/srt/mapper/ApiLogDao.java | 15 -- .../java/net/srt/query/ApiConfigQuery.java | 22 --- .../main/java/net/srt/query/ApiLogQuery.java | 16 -- .../net/srt/service/ApiConfigService.java | 38 ---- .../java/net/srt/service/ApiGroupService.java | 18 -- .../java/net/srt/service/ApiLogService.java | 18 -- .../service/impl/ApiConfigServiceImpl.java | 171 ------------------ .../srt/service/impl/ApiGroupServiceImpl.java | 93 ---------- .../srt/service/impl/ApiLogServiceImpl.java | 55 ------ .../src/main/java/net/srt/vo/ApiConfig.java | 101 ----------- .../src/main/java/net/srt/vo/ApiGroup.java | 25 --- .../src/main/java/net/srt/vo/ApiLog.java | 32 ---- .../main/resources/mapper/ApiConfigMapper.xml | 14 -- .../java/net/srt/DataServiceApplication.java | 25 --- .../srt/controller/ApiConfigController.java | 23 ++- .../DataServiceApiAuthController.java | 10 - .../controller/DataServiceAppController.java | 13 +- .../main/java/net/srt/dao/ApiConfigDao.java | 2 + .../net/srt/dao/DataServiceApiAuthDao.java | 3 + .../srt/entity/DataServiceApiAuthEntity.java | 9 +- .../srt/entity/DataServiceApiLogEntity.java | 2 +- .../net/srt/service/ApiConfigService.java | 7 + .../service/impl/ApiConfigServiceImpl.java | 21 +++ .../impl/DataServiceAppServiceImpl.java | 11 +- .../src/main/java/net/srt/vo/ApiConfigVo.java | 1 + .../java/net/srt/vo/DataServiceApiAuthVo.java | 16 +- .../main/resources/mapper/ApiConfigDao.xml | 15 +- .../mapper/DataServiceApiAuthMapper.xml | 11 ++ 50 files changed, 196 insertions(+), 1274 deletions(-) rename {srt-cloud-data-server => srt-cloud-data-assets}/.gitignore (100%) rename {srt-cloud-data-server => srt-cloud-data-assets}/pom.xml (89%) rename srt-cloud-data-server/src/main/java/net/srt/DataServiceApplication.java => srt-cloud-data-assets/src/main/java/net/srt/AssetsApplication.java (65%) rename {srt-cloud-data-server => srt-cloud-data-assets}/src/main/resources/auth.yml (100%) create mode 100644 srt-cloud-data-assets/src/main/resources/bootstrap.yml rename {srt-cloud-data-server => srt-cloud-data-assets}/src/main/resources/log4j2.xml (100%) delete mode 100644 srt-cloud-data-governance/src/main/java/net/srt/vo/DatastandardVO.java rename srt-cloud-data-governance/src/main/java/net/srt/vo/{QualityConfigVO.java => QualityConfigVo.java} (97%) delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/controller/ApiConfigController.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/controller/ApiGroupController.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/controller/ApiTest.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/convert/ApiConfigConvert.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/convert/ApiGroupConvert.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/convert/ApiLogConvert.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/dto/ApiConfigDto.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/entity/ApiConfigEntity.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/entity/ApiGroupEntity.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/entity/ApiLogEntity.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/mapper/ApiConfigDao.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/mapper/ApiGroupDao.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/mapper/ApiLogDao.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/query/ApiConfigQuery.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/query/ApiLogQuery.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/service/ApiConfigService.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/service/ApiGroupService.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/service/ApiLogService.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiConfigServiceImpl.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiGroupServiceImpl.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiLogServiceImpl.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/vo/ApiConfig.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/vo/ApiGroup.java delete mode 100644 srt-cloud-data-server/src/main/java/net/srt/vo/ApiLog.java delete mode 100644 srt-cloud-data-server/src/main/resources/mapper/ApiConfigMapper.xml delete mode 100644 srt-cloud-data-service/src/main/java/net/srt/controller/DataServiceApiAuthController.java create mode 100644 srt-cloud-data-service/src/main/resources/mapper/DataServiceApiAuthMapper.xml diff --git a/pom.xml b/pom.xml index 9003ee4..04fe2db 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,8 @@ srt-cloud-gateway srt-data-development srt-cloud-data-governance - srt-cloud-data-server + srt-cloud-data-service + srt-cloud-data-assets diff --git a/srt-cloud-data-server/.gitignore b/srt-cloud-data-assets/.gitignore similarity index 100% rename from srt-cloud-data-server/.gitignore rename to srt-cloud-data-assets/.gitignore diff --git a/srt-cloud-data-server/pom.xml b/srt-cloud-data-assets/pom.xml similarity index 89% rename from srt-cloud-data-server/pom.xml rename to srt-cloud-data-assets/pom.xml index 9d2401b..dd97b8d 100644 --- a/srt-cloud-data-server/pom.xml +++ b/srt-cloud-data-assets/pom.xml @@ -9,7 +9,7 @@ 2.0.0 - srt-cloud-data-server + srt-cloud-data-assets 8 @@ -34,24 +34,15 @@ 2.0.0 - net.srt - srt-cloud-dbswitch - 2.0.0 + org.springframework.cloud + spring-cloud-starter-bootstrap - - jsqlparser - com.github.jsqlparser - spring-boot-starter-logging org.springframework.boot - - org.springframework.cloud - spring-cloud-starter-bootstrap - com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery @@ -60,14 +51,38 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config + + com.github.whvcse + easy-captcha + com.github.xiaoymin knife4j-springdoc-ui + + com.aliyun.oss + aliyun-sdk-oss + + + com.qcloud + cos_api + + + com.qiniu + qiniu-java-sdk + + + com.huaweicloud + esdk-obs-java-bundle + + + io.minio + minio + - + org.codehaus.mojo @@ -105,7 +120,7 @@ ${project.artifactId} - net.srt.DataServiceApplication + net.srt.SystemApplication jsw @@ -160,7 +175,7 @@ - net.srt.DataServiceApplication + net.srt.SystemApplication ${project.artifactId} @@ -202,3 +217,4 @@ + diff --git a/srt-cloud-data-server/src/main/java/net/srt/DataServiceApplication.java b/srt-cloud-data-assets/src/main/java/net/srt/AssetsApplication.java similarity index 65% rename from srt-cloud-data-server/src/main/java/net/srt/DataServiceApplication.java rename to srt-cloud-data-assets/src/main/java/net/srt/AssetsApplication.java index 08dc8b9..2ba74cb 100644 --- a/srt-cloud-data-server/src/main/java/net/srt/DataServiceApplication.java +++ b/srt-cloud-data-assets/src/main/java/net/srt/AssetsApplication.java @@ -5,12 +5,17 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; +/** + * @ClassName : ${NAME} + * @Description : ${description} + * @Author : FJJ + * @Date: 2023-12-27 21:47 + */ @EnableFeignClients @EnableDiscoveryClient @SpringBootApplication -public class DataServiceApplication { +public class AssetsApplication { public static void main(String[] args) { - SpringApplication.run(DataServiceApplication.class, args); - System.out.println("==============启动成功==================="); + SpringApplication.run(AssetsApplication.class, args); } } diff --git a/srt-cloud-data-server/src/main/resources/auth.yml b/srt-cloud-data-assets/src/main/resources/auth.yml similarity index 100% rename from srt-cloud-data-server/src/main/resources/auth.yml rename to srt-cloud-data-assets/src/main/resources/auth.yml diff --git a/srt-cloud-data-assets/src/main/resources/bootstrap.yml b/srt-cloud-data-assets/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..a2348b6 --- /dev/null +++ b/srt-cloud-data-assets/src/main/resources/bootstrap.yml @@ -0,0 +1,46 @@ +server: + port: 8098 + +spring: + mvc: + servlet: + load-on-startup: 1 + application: + name: srt-cloud-data-assets + profiles: + active: dev + cloud: + nacos: + discovery: + server-addr: 101.34.77.101:8848 + # 命名空间，默认：public + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 + service: ${spring.application.name} + group: srt2.0 + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + namespace: ${spring.cloud.nacos.discovery.namespace} + file-extension: yaml + # 指定配置 + extension-configs: + - data-id: datasource.yaml + refresh: true + servlet: + multipart: + max-request-size: 100MB + max-file-size: 1024MB +storage: + enabled: true + config: + # 存储类型：local、aliyun + type: local + # 访问域名 + domain: http://localhost:8082/sys + # 配置访问前缀 + prefix: + local: + # 本地上传路径 + path: D://upload + +cbx: + isCaptcha: false diff --git a/srt-cloud-data-server/src/main/resources/log4j2.xml b/srt-cloud-data-assets/src/main/resources/log4j2.xml similarity index 100% rename from srt-cloud-data-server/src/main/resources/log4j2.xml rename to srt-cloud-data-assets/src/main/resources/log4j2.xml diff --git a/srt-cloud-data-governance/src/main/java/net/srt/init/BusinessInitializer.java b/srt-cloud-data-governance/src/main/java/net/srt/init/BusinessInitializer.java index 947e95a..cf0c336 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/init/BusinessInitializer.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/init/BusinessInitializer.java @@ -25,10 +25,10 @@ public class BusinessInitializer implements ApplicationRunner { * init task monitor */ private void initScheduleMonitor() { - //处理没执行完的采集任务 - metadataCollectRecordService.dealNotFinished(); - //处理没执行完的质量检测任务 - qualityTaskService.dealNotFinished(); +// //处理没执行完的采集任务 +// metadataCollectRecordService.dealNotFinished(); +// //处理没执行完的质量检测任务 +// qualityTaskService.dealNotFinished(); } } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/vo/DatastandardVO.java b/srt-cloud-data-governance/src/main/java/net/srt/vo/DatastandardVO.java deleted file mode 100644 index bc4a826..0000000 --- a/srt-cloud-data-governance/src/main/java/net/srt/vo/DatastandardVO.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.srt.vo; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; - -/** - * @ClassName : DatastandardVo - * @Description : - * @Author : FJJ - * @Date: 2023-12-23 12:05 - */ -@Data -@Schema(description = "标准管理查询") -public class DatastandardVo implements Serializable { - private static final long serialVersionUID = 1L; - @TableId("id") - private Long id; - private Integer categoryId; - private String engName; - private String cnName; - private Integer codeNum; - private String dataType; - private Integer dataLength; - private Integer dataPrecision; - private Integer nullable; - private Integer standardCodeId; - private Integer type; - private String note; - private Long projectId; - private Integer status; - private Integer version; - private Integer deleted; - private String creator; - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - private String 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 ifStandardRel; - private String group; -} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/vo/QualityConfigVO.java b/srt-cloud-data-governance/src/main/java/net/srt/vo/QualityConfigVo.java similarity index 97% rename from srt-cloud-data-governance/src/main/java/net/srt/vo/QualityConfigVO.java rename to srt-cloud-data-governance/src/main/java/net/srt/vo/QualityConfigVo.java index 5ec83a9..1c10b51 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/vo/QualityConfigVO.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/vo/QualityConfigVo.java @@ -18,7 +18,7 @@ import java.util.List; */ @Data @Schema(description = "数据治理-质量规则配置") -public class QualityConfigVO implements Serializable { +public class QualityConfigVo implements Serializable { private static final long serialVersionUID = 1L; @Schema(description = "自增id") 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 deleted file mode 100644 index 3cad1b4..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/controller/ApiConfigController.java +++ /dev/null @@ -1,119 +0,0 @@ -package net.srt.controller; - -import io.swagger.v3.oas.annotations.Operation; -import lombok.AllArgsConstructor; -import net.srt.dto.ApiConfigDto; -import net.srt.entity.ApiConfigEntity; -import net.srt.framework.common.page.PageResult; -import net.srt.framework.common.utils.Result; -import net.srt.framework.common.utils.TreeNodeVo; -import net.srt.query.ApiConfigQuery; -import net.srt.service.ApiConfigService; -import net.srt.vo.ApiConfig; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.List; - -@RestController -@RequestMapping("/api-config") -@AllArgsConstructor -public class ApiConfigController { - - private final ApiConfigService apiConfigService; - - - - /** - * 查询文件分组树 - * - * @return 结果列表 - */ - @GetMapping("/api-group") - @Operation(summary = "查询文件分组树") - public Result> listTree() { - return Result.ok(apiConfigService.listTree()); - } - - /** - * 分页查询API配置 - * @param query API配置查询对象 - * @return 分页结果 - */ - @GetMapping("/page") - @Operation(summary = "分页") - @PreAuthorize("hasAuthority('data-service:api-config:page')") - public Result> page(@Valid ApiConfigQuery query) { - PageResult page = apiConfigService.page(query); - - return Result.ok(page); - } - - /** - * 获取IP和端口信息 - * - * @return 返回IP和端口信息 - */ - @GetMapping("/getIpPort") - public Result getIpPort() { - return Result.ok(apiConfigService.getIpPort()); - } - - /** - * 根据ID获取API配置信息 - * - * @param id API配置ID - * @return API配置实体对象 - */ - @GetMapping("/{id}") - @Operation(summary = "查看") - @PreAuthorize("hasAuthority('data-service:api-config:info')") - public Result get(@PathVariable("id") Long id) { - ApiConfigEntity apiConfig = apiConfigService.getByI(id); - - return Result.ok(apiConfig); - } - - @PutMapping("/{id}") - @Operation(summary = "修改") - @PreAuthorize("hasAuthority('data-service:api-config:update')") - public Result update(@PathVariable Long id, @RequestBody @Valid ApiConfigEntity vo) { - apiConfigService.update(id,vo); - return Result.ok(); - } - @PutMapping("/{id}/offline") - @Operation(summary = "下线") - @PreAuthorize("hasAuthority('data-service:api-config:update')") - public Result xia(@PathVariable Long id) { - apiConfigService.xia(id); - return Result.ok(); - } - - @PutMapping("/{id}/online") - @Operation(summary = "上线") - @PreAuthorize("hasAuthority('data-service:api-config:update')") - public Result shang(@PathVariable Long id) { - apiConfigService.shang(id); - return Result.ok(); - } - - - @PostMapping - @Operation(summary = "新增") - @PreAuthorize("hasAuthority('data-service:api-config:save')") - public Result insert(@RequestBody ApiConfig vo) { - apiConfigService.sav(vo); - return Result.ok(); - } - - @DeleteMapping - @Operation(summary = "删除") - @PreAuthorize("hasAuthority('data-service:api-config:delete')") - public Result delete(@RequestBody List idList) { - apiConfigService.removeByI(idList); - return Result.ok(); - } - - -} diff --git a/srt-cloud-data-server/src/main/java/net/srt/controller/ApiGroupController.java b/srt-cloud-data-server/src/main/java/net/srt/controller/ApiGroupController.java deleted file mode 100644 index d63facc..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/controller/ApiGroupController.java +++ /dev/null @@ -1,70 +0,0 @@ -package net.srt.controller; - -import io.swagger.v3.oas.annotations.Operation; -import lombok.AllArgsConstructor; -import net.srt.convert.ApiGroupConvert; -import net.srt.entity.ApiGroupEntity; -import net.srt.framework.common.utils.Result; -import net.srt.framework.common.utils.TreeNodeVo; -import net.srt.service.ApiGroupService; -import net.srt.vo.ApiGroup; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.List; - -/** -* 数据服务-api分组 -* -* @author zrx 985134801@qq.com -* @since 1.0.0 2023-01-28 -*/ -@RestController -@RequestMapping("/api-group") -@AllArgsConstructor -public class ApiGroupController { - private final ApiGroupService apiGroupService; - - @GetMapping - @Operation(summary = "查询文件分组树") - public Result> listTree() { - return Result.ok(apiGroupService.listTree()); - } - - @GetMapping("{id}") - @Operation(summary = "信息") - @PreAuthorize("hasAuthority('data-service:api-group:info')") - public Result get(@PathVariable("id") Long id){ - ApiGroupEntity entity = apiGroupService.getById(id); - return Result.ok(ApiGroupConvert.INSTANCE.convert(entity)); - } - - - @PostMapping - @Operation(summary = "保存") - @PreAuthorize("hasAuthority('data-service:api-group:save')") - public Result save(@RequestBody ApiGroup vo) { - apiGroupService.save(vo); - return Result.ok(); - } - - - @PutMapping - @Operation(summary = "修改") - @PreAuthorize("hasAuthority('data-service:api-group:update')") - public Result update(@RequestBody @Valid ApiGroup vo) { - apiGroupService.update(vo); - return Result.ok(); - } - - - @DeleteMapping("/{id}") - @Operation(summary = "删除") - @PreAuthorize("hasAuthority('data-service:api-group:delete')") - public Result delete(@PathVariable Long id) { - apiGroupService.delete(id); - return Result.ok(); - } - -} diff --git a/srt-cloud-data-server/src/main/java/net/srt/controller/ApiTest.java b/srt-cloud-data-server/src/main/java/net/srt/controller/ApiTest.java deleted file mode 100644 index 2568106..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/controller/ApiTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.srt.controller; - -import io.swagger.v3.oas.annotations.Operation; -import lombok.AllArgsConstructor; -import net.srt.framework.common.page.PageResult; -import net.srt.framework.common.utils.Result; -import net.srt.query.ApiConfigQuery; -import net.srt.query.ApiLogQuery; -import net.srt.service.ApiLogService; -import net.srt.vo.ApiConfig; -import net.srt.vo.ApiLog; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.validation.Valid; - -/** - * @ClassName ApiTest - * @Description 描述 - * @Author 栗永斌 - */ -@RestController -@RequestMapping("/log") -@AllArgsConstructor -public class ApiTest { - - @Autowired - ApiLogService apiLogService; - - @GetMapping("/page") - @Operation(summary = "日志列表") - @PreAuthorize("hasAuthority('data-service:api-config:page')") - public Result> page(@Valid ApiLogQuery query) { - PageResult page = apiLogService.pag(query); - - return Result.ok(page); - } - -} diff --git a/srt-cloud-data-server/src/main/java/net/srt/convert/ApiConfigConvert.java b/srt-cloud-data-server/src/main/java/net/srt/convert/ApiConfigConvert.java deleted file mode 100644 index d411d67..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/convert/ApiConfigConvert.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.srt.convert; - -import net.srt.dto.ApiConfigDto; -import net.srt.entity.ApiConfigEntity; -import net.srt.vo.ApiConfig; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** -* 数据服务-api配置 -* -* @author zrx 985134801@qq.com -* @since 1.0.0 2023-01-28 -*/ -@Mapper -public interface ApiConfigConvert { - ApiConfigConvert INSTANCE = Mappers.getMapper(ApiConfigConvert.class); - - ApiConfigEntity convert(ApiConfig vo); - - ApiConfig convert(ApiConfigEntity entity); - - ApiConfigDto convertDto(ApiConfigEntity entity); - - List convertList(List list); - -} diff --git a/srt-cloud-data-server/src/main/java/net/srt/convert/ApiGroupConvert.java b/srt-cloud-data-server/src/main/java/net/srt/convert/ApiGroupConvert.java deleted file mode 100644 index 1c4f4bb..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/convert/ApiGroupConvert.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.srt.convert; - -import net.srt.entity.ApiGroupEntity; -import net.srt.vo.ApiGroup; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** -* 数据服务-api分组 -* -* @author zrx 985134801@qq.com -* @since 1.0.0 2023-01-28 -*/ -@Mapper -public interface ApiGroupConvert { - ApiGroupConvert INSTANCE = Mappers.getMapper(ApiGroupConvert.class); - - ApiGroupEntity convert(ApiGroup vo); - - ApiGroup convert(ApiGroupEntity entity); - - List convertList(List list); - -} 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 deleted file mode 100644 index 6399679..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/convert/ApiLogConvert.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.srt.convert; - -import net.srt.entity.ApiLogEntity; -import net.srt.vo.ApiLog; - -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * @ClassName ApiLogConvert - * @Description 描述 - * @Author 栗永斌 - */ -@Mapper -public interface ApiLogConvert { - - ApiLogConvert INSTANCE = Mappers.getMapper(ApiLogConvert.class); - - ApiLogEntity convert(ApiLog vo); - - ApiLog convert(ApiLogEntity entity); - - List convertList(List list); -} diff --git a/srt-cloud-data-server/src/main/java/net/srt/dto/ApiConfigDto.java b/srt-cloud-data-server/src/main/java/net/srt/dto/ApiConfigDto.java deleted file mode 100644 index ce03da4..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/dto/ApiConfigDto.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.srt.dto; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import net.srt.framework.common.utils.DateUtils; - -import java.io.Serializable; -import java.util.Date; - - -@Data -public class ApiConfigDto implements Serializable { - private static final long serialVersionUID = 1L; - 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 String 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; - private Date createTime; - private Long updater; - private Date updateTime; - private Integer requestedTimes; - private Integer requestedSuccessTimes; - private Integer requestedFailedTimes; - private Long authId; - private String group; - - -} 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 deleted file mode 100644 index 7b9dec0..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/entity/ApiConfigEntity.java +++ /dev/null @@ -1,61 +0,0 @@ -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; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -@Data -@TableName("data_dispatch_catalogue") -public class ApiConfigEntity extends BaseEntity { - /** - * 父级id（顶级为0） - */ - private Long parentId; - - /** - * 分组名称 - */ - private String name; - - /** - * 分组序号 - */ - private Integer orderNo; - - /** - * 描述 - */ - private String description; - - /** - * 分组路径 - */ - private String path; - - private Integer type; - - /** - * 项目id - */ - private Long projectId; - private Long id; - - // 私有属性，状态 - private Integer status; - // 私有属性，发布用户ID - 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; - private Integer previlege; - private Integer openTrans; - -} diff --git a/srt-cloud-data-server/src/main/java/net/srt/entity/ApiGroupEntity.java b/srt-cloud-data-server/src/main/java/net/srt/entity/ApiGroupEntity.java deleted file mode 100644 index aabf06c..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/entity/ApiGroupEntity.java +++ /dev/null @@ -1,41 +0,0 @@ -package net.srt.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import net.srt.framework.mybatis.entity.BaseEntity; - -@Data -@TableName(value = "data_dispatch_catalogue",autoResultMap = true) -public class ApiGroupEntity extends BaseEntity { - /** - * 父级id（顶级为0） - */ - private Long parentId; - - /** - * 分组名称 - */ - private String name; - - /** - * 分组序号 - */ - private Integer orderNo; - - /** - * 描述 - */ - private String description; - - /** - * 分组路径 - */ - private String path; - - private Integer type; - - /** - * 项目id - */ - private Long projectId; -} diff --git a/srt-cloud-data-server/src/main/java/net/srt/entity/ApiLogEntity.java b/srt-cloud-data-server/src/main/java/net/srt/entity/ApiLogEntity.java deleted file mode 100644 index f819add..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/entity/ApiLogEntity.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.srt.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import net.srt.framework.mybatis.entity.BaseEntity; - -import java.util.Date; - -/** - * @ClassName ApiLogEntity - * @Description 描述 - * @Author 栗永斌 - */ -@Data -@TableName(value = "data_service_api_log",autoResultMap = true) -public class ApiLogEntity extends BaseEntity { -// private Integer id; - private String url; - private Integer duration; - private String ip; - private Integer apiId; - private String error; - private Integer projectId; -// private String deleted; -// private Integer creator; -// private String createTime; -// private Integer updater; - private Date updateTime; - private String apiName; - -} 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 deleted file mode 100644 index 6ddc07f..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/mapper/ApiConfigDao.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.srt.mapper; - -import net.srt.entity.ApiConfigEntity; -import net.srt.framework.mybatis.dao.BaseDao; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface ApiConfigDao extends BaseDao { - void xia(@Param("id") Long id); - - void shang(@Param("id") Long id); - -} diff --git a/srt-cloud-data-server/src/main/java/net/srt/mapper/ApiGroupDao.java b/srt-cloud-data-server/src/main/java/net/srt/mapper/ApiGroupDao.java deleted file mode 100644 index a8bd1f0..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/mapper/ApiGroupDao.java +++ /dev/null @@ -1,9 +0,0 @@ -package net.srt.mapper; - -import net.srt.entity.ApiGroupEntity; -import net.srt.framework.mybatis.dao.BaseDao; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface ApiGroupDao extends BaseDao { -} diff --git a/srt-cloud-data-server/src/main/java/net/srt/mapper/ApiLogDao.java b/srt-cloud-data-server/src/main/java/net/srt/mapper/ApiLogDao.java deleted file mode 100644 index 6e45e61..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/mapper/ApiLogDao.java +++ /dev/null @@ -1,15 +0,0 @@ -package net.srt.mapper; - -import net.srt.entity.ApiGroupEntity; -import net.srt.entity.ApiLogEntity; -import net.srt.framework.mybatis.dao.BaseDao; -import org.apache.ibatis.annotations.Mapper; - -/** - * @ClassName ApiLogDao - * @Description 描述 - * @Author 栗永斌 - */ -@Mapper -public interface ApiLogDao extends BaseDao { -} 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 deleted file mode 100644 index a9631c1..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/query/ApiConfigQuery.java +++ /dev/null @@ -1,22 +0,0 @@ -package net.srt.query; - -import lombok.Data; -import net.srt.framework.common.query.Query; - -@Data -public class ApiConfigQuery extends Query { - - private Long groupId; - private Long resourceId; - private Long appId; - private String name; - private String path; - private String contentType; - private Integer status; - private Integer sqlDbType; - private Long databaseId; - private Integer privates; - private Integer openTrans; - private Integer queryApply; - private Integer ifMarket; -} diff --git a/srt-cloud-data-server/src/main/java/net/srt/query/ApiLogQuery.java b/srt-cloud-data-server/src/main/java/net/srt/query/ApiLogQuery.java deleted file mode 100644 index 09aded7..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/query/ApiLogQuery.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.srt.query; - -import lombok.Data; -import net.srt.framework.common.query.Query; - -/** - * @ClassName ApiLogQuery - * @Description 描述 - * @Author 栗永斌 - */ -@Data -public class ApiLogQuery extends Query { - - private String ip; - private String apiName; -} 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 deleted file mode 100644 index 83335ce..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/service/ApiConfigService.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.srt.service; - -import net.srt.dto.ApiConfigDto; -import net.srt.entity.ApiConfigEntity; -import net.srt.framework.common.page.PageResult; -import net.srt.framework.common.utils.Result; -import net.srt.framework.common.utils.TreeNodeVo; -import net.srt.framework.mybatis.service.BaseService; -import net.srt.query.ApiConfigQuery; -import net.srt.vo.ApiConfig; - -import java.util.List; - -public interface ApiConfigService extends BaseService { - String getIpPort(); - - List listTree(); - - - PageResult page(ApiConfigQuery query); - - ApiConfigEntity getByI(Long id); - - - void update(Long id, ApiConfigEntity vo); - - void xia(Long id); - - - void shang(Long id); - - - - void sav(ApiConfig vo); - - void removeByI(List idList); - -} diff --git a/srt-cloud-data-server/src/main/java/net/srt/service/ApiGroupService.java b/srt-cloud-data-server/src/main/java/net/srt/service/ApiGroupService.java deleted file mode 100644 index df523d0..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/service/ApiGroupService.java +++ /dev/null @@ -1,18 +0,0 @@ -package net.srt.service; - -import net.srt.entity.ApiGroupEntity; -import net.srt.framework.common.utils.TreeNodeVo; -import net.srt.framework.mybatis.service.BaseService; -import net.srt.vo.ApiGroup; - -import java.util.List; - -public interface ApiGroupService extends BaseService { - List listTree(); - - void save(ApiGroup vo); - - void update(ApiGroup vo); - - void delete(Long id); -} 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 deleted file mode 100644 index 3404363..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/service/ApiLogService.java +++ /dev/null @@ -1,18 +0,0 @@ -package net.srt.service; - -import net.srt.entity.ApiLogEntity; -import net.srt.framework.common.page.PageResult; -import net.srt.framework.mybatis.service.BaseService; -import net.srt.query.ApiLogQuery; -import net.srt.vo.ApiLog; - -/** - * @ClassName ApiLogService - * @Description 描述 - * @Author 栗永斌 - */ -public interface ApiLogService extends BaseService { - - PageResult pag(ApiLogQuery query); - -} 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 deleted file mode 100644 index e17bf7c..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiConfigServiceImpl.java +++ /dev/null @@ -1,171 +0,0 @@ -package net.srt.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.AllArgsConstructor; -import net.srt.convert.ApiConfigConvert; -import net.srt.convert.ApiGroupConvert; -import net.srt.dto.ApiConfigDto; -import net.srt.entity.ApiConfigEntity; -import net.srt.entity.ApiGroupEntity; -import net.srt.framework.common.page.PageResult; -import net.srt.framework.common.utils.BeanUtil; -import net.srt.framework.common.utils.BuildTreeUtils; -import net.srt.framework.common.utils.Result; -import net.srt.framework.common.utils.TreeNodeVo; -import net.srt.framework.mybatis.service.impl.BaseServiceImpl; -import net.srt.mapper.ApiConfigDao; -import net.srt.query.ApiConfigQuery; -import net.srt.service.ApiConfigService; -import net.srt.vo.ApiConfig; -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 -@AllArgsConstructor -public class ApiConfigServiceImpl extends BaseServiceImpl implements ApiConfigService { - @Override - public String getIpPort() { - return null; - } - - - /** - * 从数据库中查询并返回树结构的节点列表 - * @return List 树节点列表 - */ - @Override - public List listTree() { - // 创建查询条件 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - // 设置查询条件，排除组织id - dataScopeWithoutOrgId(wrapper); - // 按照排序字段升序排序 - wrapper.orderByAsc(ApiConfigEntity::getOrderNo); - // 从数据库中查询列表数据 - List dataFileCategoryEntities = baseMapper.selectList(wrapper); - // 将数据转换为树节点vo列表 - List treeNodeVos = BeanUtil.copyListProperties(dataFileCategoryEntities, TreeNodeVo::new, (oldItem, newItem) -> { - // 设置树节点的标签为名称 - newItem.setLabel(oldItem.getName()); - // 设置树节点的值为id - newItem.setValue(oldItem.getId()); - // 设置树节点是否不可用，类型为0表示不可用 - newItem.setDisabled(oldItem.getType() == 0); - // 如果树节点路径包含斜杠，则设置父路径为路径截取到倒数第一个斜杠的位置 - if (newItem.getPath().contains("/")) { - newItem.setParentPath(newItem.getPath().substring(0, newItem.getPath().lastIndexOf("/"))); - } - }); - // 调用工具类构建树结构 - return BuildTreeUtils.buildTree(treeNodeVos); - } - - - - - /** - * 分页查询API配置信息 - * - * @param query 查询条件 - * @return 分页结果 - */ - @Override - public PageResult page(ApiConfigQuery query) { - // 调用Mapper层方法，查询分页数据 - IPage page = baseMapper.selectPage(getPage(query), getWrapper(query)); - - // 将查询结果转换为ApiConfig对象列表 - // 返回分页结果 - return new PageResult<>(ApiConfigConvert.INSTANCE.convertList(page.getRecords()), page.getTotal()); - } - - - /** - * 根据ID获取ApiConfigEntity对象 - * - * @param id ID值 - * @return ApiConfigEntity对象 - */ - @Override - public ApiConfigEntity getByI(Long id) { - return id != null ? baseMapper.selectById(id) : null; - } - - @Override - public void update(Long id,ApiConfigEntity vo) { - baseMapper.deleteById(id); - baseMapper.insert(vo); -// if (vo.getType() == 0) { -// ApiGroupEntity apiGroupEntity = new ApiGroupEntity(); -// apiGroupEntity.setId(vo.getId()); -// apiGroupEntity.setVersion(vo.getVersion()); -// apiGroupEntity.setDeleted(vo.getDeleted()); -// apiGroupEntity.setUpdateTime(vo.getUpdateTime()); -// apiGroupEntity.setCreateTime(vo.getCreateTime()); -// apiGroupEntity.setUpdater(vo.getUpdater()); -// } - } - - @Resource - ApiConfigDao apiConfigDto; - - @Override - public void xia(Long id) { - apiConfigDto.xia(id); - } - - - - @Override - public void shang(Long id) { - apiConfigDto.shang(id); - } - - - - @Override - public void sav(ApiConfig vo) { - - - ApiConfigEntity entity = ApiConfigConvert.INSTANCE.convert(vo); - entity.setPath(recursionPath(entity, null)); - entity.setProjectId(getProjectId()); - baseMapper.insert(entity); // 使用 insertSelective() 方法进行插入操作 - } - - - @Override - public void removeByI(List idList) { - baseMapper.deleteBatchIds(idList); - } - - private String recursionPath(ApiConfigEntity groupEntity, String path) { - if (StringUtil.isBlank(path)) { - path = groupEntity.getName(); - } - if (groupEntity.getParentId() != 0) { - ApiConfigEntity parent = getById(groupEntity.getParentId()); - path = parent.getName() + "/" + path; - return recursionPath(parent, path); - } - return path; - } - - private LambdaQueryWrapper getWrapper(ApiConfigQuery query) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.like(StringUtil.isNotBlank(query.getName()), ApiConfigEntity::getName, query.getName()); - wrapper.like(StringUtil.isNotBlank(query.getPath()), ApiConfigEntity::getPath, query.getPath()); -// wrapper.eq(StringUtil.isNotBlank(query.getContentType()), ApiConfigEntity::getContentType, query.getContentType()); -// wrapper.eq(query.getStatus()!= null, ApiConfigEntity::getStatus, query.getStatus()); -// wrapper.eq(query.getSqlDbType() != null, ApiConfigEntity::getSqlDbType, query.getSqlDbType()); -// - return wrapper; - } - -} 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 deleted file mode 100644 index bce878f..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiGroupServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package net.srt.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import lombok.AllArgsConstructor; -import net.srt.convert.ApiGroupConvert; -import net.srt.entity.ApiConfigEntity; -import net.srt.entity.ApiGroupEntity; -import net.srt.framework.common.exception.ServerException; -import net.srt.framework.common.utils.BeanUtil; -import net.srt.framework.common.utils.BuildTreeUtils; -import net.srt.framework.common.utils.TreeNodeVo; -import net.srt.framework.mybatis.service.impl.BaseServiceImpl; -import net.srt.mapper.ApiGroupDao; -import net.srt.service.ApiConfigService; -import net.srt.service.ApiGroupService; -import net.srt.vo.ApiGroup; -import org.springframework.stereotype.Service; -import srt.cloud.framework.dbswitch.common.util.StringUtil; - -import java.util.List; - -@Service -@AllArgsConstructor -public class ApiGroupServiceImpl extends BaseServiceImpl implements ApiGroupService{ -// private final ApiConfigService apiConfigService; - @Override - public List listTree() { - List treeNodeVos = getTreeNodeVos(); - return BuildTreeUtils.buildTree(treeNodeVos); - } - - private List getTreeNodeVos() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - dataScopeWithoutOrgId(wrapper); - wrapper.orderByAsc(ApiGroupEntity::getOrderNo); - List apiGroupEntities = baseMapper.selectList(wrapper); - return BeanUtil.copyListProperties(apiGroupEntities, TreeNodeVo::new, (oldItem, newItem) -> { - newItem.setLabel(oldItem.getName()); - newItem.setValue(oldItem.getId()); - newItem.setDisabled(oldItem.getType() == 1); - if (newItem.getPath().contains("/")) { - newItem.setParentPath(newItem.getPath().substring(0, newItem.getPath().lastIndexOf("/"))); - } - }); - } - - @Override - public void save(ApiGroup vo) { - ApiGroupEntity entity = ApiGroupConvert.INSTANCE.convert(vo); - entity.setPath(recursionPath(entity, null)); - entity.setProjectId(getProjectId()); - baseMapper.insert(entity); // 使用 insertSelective() 方法进行插入操作 - } - - @Override - public void update(ApiGroup vo) { - ApiGroupEntity entity = ApiGroupConvert.INSTANCE.convert(vo); - entity.setPath(recursionPath(entity, null)); - entity.setProjectId(getProjectId()); - updateById(entity); - } - - private String recursionPath(ApiGroupEntity groupEntity, String path) { - if (StringUtil.isBlank(path)) { - path = groupEntity.getName(); - } - if (groupEntity.getParentId() != 0) { - ApiGroupEntity parent = getById(groupEntity.getParentId()); - path = parent.getName() + "/" + path; - return recursionPath(parent, path); - } - return path; - } - - @Override - public void delete(Long id) { - //查询有没有子节点 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ApiGroupEntity::getParentId, id).last(" limit 1"); - ApiGroupEntity one = baseMapper.selectOne(wrapper); - if (one != null) { - throw new ServerException("存在子节点，不允许删除！"); - } -// //查询有没有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 deleted file mode 100644 index 18e2019..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/service/impl/ApiLogServiceImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -package net.srt.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.AllArgsConstructor; - -import net.srt.convert.ApiLogConvert; - - -import net.srt.entity.ApiLogEntity; -import net.srt.framework.common.page.PageResult; -import net.srt.framework.mybatis.service.impl.BaseServiceImpl; -import net.srt.mapper.ApiLogDao; - -import net.srt.query.ApiLogQuery; - -import net.srt.service.ApiLogService; -import net.srt.vo.ApiLog; -import org.springframework.stereotype.Service; -import srt.cloud.framework.dbswitch.common.util.StringUtil; - -/** - * @ClassName ApiLogServiceImpl - * @Description 描述 - * @Author 栗永斌 - */ -@Service -@AllArgsConstructor -public class ApiLogServiceImpl extends BaseServiceImpl implements ApiLogService { - - - @Override - public PageResult pag(ApiLogQuery query) { - // 调用Mapper层方法，查询分页数据 - IPage page = baseMapper.selectPage(getPage(query), getWrapper(query)); - - - // 将查询结果转换为ApiConfig对象列表 - // 返回分页结果 - return new PageResult<>(ApiLogConvert.INSTANCE.convertList(page.getRecords()), page.getTotal()); - } - - private LambdaQueryWrapper getWrapper(ApiLogQuery query) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.like(StringUtil.isNotBlank(query.getApiName()), ApiLogEntity::getApiName, query.getApiName()); - wrapper.like(StringUtil.isNotBlank(query.getIp()), ApiLogEntity::getIp, query.getIp()); -// wrapper.eq(StringUtil.isNotBlank(query.getContentType()), ApiConfigEntity::getContentType, query.getContentType()); -// wrapper.eq(query.getStatus()!= null, ApiConfigEntity::getStatus, query.getStatus()); -// wrapper.eq(query.getSqlDbType() != null, ApiConfigEntity::getSqlDbType, query.getSqlDbType()); - - return wrapper; - } - -} 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 deleted file mode 100644 index 73251a0..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/vo/ApiConfig.java +++ /dev/null @@ -1,101 +0,0 @@ -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; - -/** -* 数据服务-api配置 -* -* @author zrx 985134801@qq.com -* @since 1.0.0 2023-01-28 -*/ -@Data -public class ApiConfig implements Serializable { - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Long id; - private Integer parentId; - private Integer type; - private String name; - private Integer orderNo; - private String description; - private String path; - private Integer projectId; - private Integer version; - private Integer deleted; - 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 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 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; - -} diff --git a/srt-cloud-data-server/src/main/java/net/srt/vo/ApiGroup.java b/srt-cloud-data-server/src/main/java/net/srt/vo/ApiGroup.java deleted file mode 100644 index dcaa232..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/vo/ApiGroup.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.srt.vo; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -@Data -public class ApiGroup implements Serializable { - private static final long serialVersionUID = 1L; - private Long id; - private Long parentId; - private Integer type; - private String name; - private String description; - private Integer orderNo; - private String path; - private Long projectId; - private Integer version; - private Integer deleted; - private Long creator; - private Date createTime; - private Long updater; - private Date updateTime; -} diff --git a/srt-cloud-data-server/src/main/java/net/srt/vo/ApiLog.java b/srt-cloud-data-server/src/main/java/net/srt/vo/ApiLog.java deleted file mode 100644 index e45af60..0000000 --- a/srt-cloud-data-server/src/main/java/net/srt/vo/ApiLog.java +++ /dev/null @@ -1,32 +0,0 @@ -package net.srt.vo; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * @ClassName ApiLog - * @Description 描述 - * @Author 栗永斌 - */ -@Data -public class ApiLog implements Serializable { - private static final long serialVersionUID = 1L; - - - private Integer id; - private String url; - private Integer duration; - private String ip; - private Integer apiId; - private String error; - private Integer projectId; - private String deleted; - private Integer creator; - private String createTime; - private Integer updater; - private Date updateTime; - - -} diff --git a/srt-cloud-data-server/src/main/resources/mapper/ApiConfigMapper.xml b/srt-cloud-data-server/src/main/resources/mapper/ApiConfigMapper.xml deleted file mode 100644 index a15f3e3..0000000 --- a/srt-cloud-data-server/src/main/resources/mapper/ApiConfigMapper.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - update data_dispatch_catalogue set status = 0 where id = #{id} - - - update data_dispatch_catalogue set status = 1 where id = #{id} - - diff --git a/srt-cloud-data-service/src/main/java/net/srt/DataServiceApplication.java b/srt-cloud-data-service/src/main/java/net/srt/DataServiceApplication.java index f8b6551..c593712 100644 --- a/srt-cloud-data-service/src/main/java/net/srt/DataServiceApplication.java +++ b/srt-cloud-data-service/src/main/java/net/srt/DataServiceApplication.java @@ -11,30 +11,5 @@ import org.springframework.cloud.openfeign.EnableFeignClients; public class DataServiceApplication { public static void main(String[] args) { SpringApplication.run(DataServiceApplication.class, args); - System.out.println("\n" + - "/**\n" + - " * _ooOoo_\n" + - " * o8888888o\n" + - " * 88\" . \"88\n" + - " * (| -_- |)\n" + - " * O\\ = /O\n" + - " * ____/`---'\\____\n" + - " * . ' \\\\| |// `.\n" + - " * / \\\\||| : |||// \\\n" + - " * / _||||| -:- |||||- \\\n" + - " * | | \\\\\\ - /// | |\n" + - " * | \\_| ''\\---/'' | |\n" + - " * \\ .-\\__ `-` ___/-. /\n" + - " * ___`. .' /--.--\\ `. . __\n" + - " * .\"\" '< `.___\\_<|>_/___.' >'\"\".\n" + - " * | | : `- \\`.;`\\ _ /`;.`/ - ` : | |\n" + - " * \\ \\ `-. \\_ __\\ /__ _/ .-` / /\n" + - " * ======`-.____`-.___\\_____/___.-`____.-'======\n" + - " * `=---='\n" + - " *\n" + - " * .............................................\n" + - " * 佛祖保佑 代码 启动 永无BUG\n" + - " */\n" + - "————————代码——启动————————"); } } diff --git a/srt-cloud-data-service/src/main/java/net/srt/controller/ApiConfigController.java b/srt-cloud-data-service/src/main/java/net/srt/controller/ApiConfigController.java index bbe14b5..ee9046a 100644 --- a/srt-cloud-data-service/src/main/java/net/srt/controller/ApiConfigController.java +++ b/srt-cloud-data-service/src/main/java/net/srt/controller/ApiConfigController.java @@ -9,6 +9,7 @@ import net.srt.framework.common.utils.Result; import net.srt.query.ApiConfigQuery; import net.srt.service.ApiConfigService; import net.srt.vo.ApiConfigVo; +import net.srt.vo.DataServiceApiAuthVo; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -42,13 +43,33 @@ public class ApiConfigController { } @GetMapping("page-auth") - @Operation(summary = "根据resourceId分页获取") public Result> pageAuth(@Valid ApiConfigQuery query) { PageResult page = apiConfigService.page(query); return Result.ok(page); } + //取消授权 +// @PutMapping("/auth-info") +// @Operation(summary = "修改授权") +// public Result upAuth(@RequestBody DataServiceApiAuthVo authVO){ +// apiConfigService.upAuth(authVO); +// return Result.ok(); +// } + @Operation(summary = "回显") + @GetMapping(value = "/auth-info/{authId}") + public Result getAuthId(@PathVariable Long authId){ + return Result.ok(apiConfigService.getAuthInfo(authId)); + } + + //重置调用次数 + @Operation(summary = "重置调用次数") + @PutMapping("/reset-requested/{authId}") + public Result resetRequested(@PathVariable Long authId){ + apiConfigService.resetRequested(authId); + return Result.ok(); + } + @GetMapping("{id}") @Operation(summary = "信息") diff --git a/srt-cloud-data-service/src/main/java/net/srt/controller/DataServiceApiAuthController.java b/srt-cloud-data-service/src/main/java/net/srt/controller/DataServiceApiAuthController.java deleted file mode 100644 index 0feaeae..0000000 --- a/srt-cloud-data-service/src/main/java/net/srt/controller/DataServiceApiAuthController.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.srt.controller; - -/** - * @ClassName : DataServiceApiAuthController - * @Description : - * @Author : FJJ - * @Date: 2023-12-26 15:22 - */ -public class DataServiceApiAuthController { -} diff --git a/srt-cloud-data-service/src/main/java/net/srt/controller/DataServiceAppController.java b/srt-cloud-data-service/src/main/java/net/srt/controller/DataServiceAppController.java index f77f39d..f50d62d 100644 --- a/srt-cloud-data-service/src/main/java/net/srt/controller/DataServiceAppController.java +++ b/srt-cloud-data-service/src/main/java/net/srt/controller/DataServiceAppController.java @@ -34,12 +34,12 @@ public class DataServiceAppController { PageResult pageResult = dataServiceAppService.page(query); return Result.ok(pageResult); } - @GetMapping("{id}") - @Operation(summary = "信息") - public Result get(@PathVariable("id") Long id){ - DataServiceAppEntity dataServiceAppEntity = dataServiceAppService.getById(id); - return Result.ok(DataServiceAppConvert.INSTANCE.convert(dataServiceAppEntity)); - } +// @GetMapping("{id}") +// @Operation(summary = "信息") +// public Result get(@PathVariable("id") Long id){ +// DataServiceAppEntity dataServiceAppEntity = dataServiceAppService.getById(id); +// return Result.ok(DataServiceAppConvert.INSTANCE.convert(dataServiceAppEntity)); +// } @PostMapping @Operation(summary = "保存") @@ -72,6 +72,7 @@ public class DataServiceAppController { return Result.ok(); } + @PutMapping("/auth") @Operation(summary = "修改授权") public Result upAuth(@RequestBody DataServiceApiAuthVo authVO){ diff --git a/srt-cloud-data-service/src/main/java/net/srt/dao/ApiConfigDao.java b/srt-cloud-data-service/src/main/java/net/srt/dao/ApiConfigDao.java index 970b446..088d674 100644 --- a/srt-cloud-data-service/src/main/java/net/srt/dao/ApiConfigDao.java +++ b/srt-cloud-data-service/src/main/java/net/srt/dao/ApiConfigDao.java @@ -17,4 +17,6 @@ public interface ApiConfigDao extends BaseDao { void updateById(@Param("apiId") Long apiId, @Param("id") Long id); List getAuthList(Map params); + + void updateAuthId(@Param("authId") Long authId); } diff --git a/srt-cloud-data-service/src/main/java/net/srt/dao/DataServiceApiAuthDao.java b/srt-cloud-data-service/src/main/java/net/srt/dao/DataServiceApiAuthDao.java index a8d5b16..d9c84a6 100644 --- a/srt-cloud-data-service/src/main/java/net/srt/dao/DataServiceApiAuthDao.java +++ b/srt-cloud-data-service/src/main/java/net/srt/dao/DataServiceApiAuthDao.java @@ -3,6 +3,7 @@ package net.srt.dao; import net.srt.entity.DataServiceApiAuthEntity; import net.srt.framework.mybatis.dao.BaseDao; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * @ClassName : DataServiceApiAuthDao @@ -12,4 +13,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface DataServiceApiAuthDao extends BaseDao { + void resetRequested(Long authId); + } diff --git a/srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceApiAuthEntity.java b/srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceApiAuthEntity.java index e17b9df..94b00bb 100644 --- a/srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceApiAuthEntity.java +++ b/srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceApiAuthEntity.java @@ -1,9 +1,6 @@ package net.srt.entity; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; import net.srt.framework.mybatis.entity.BaseEntity; @@ -18,8 +15,10 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = false) @Data -@TableName("data_service_api_auth1") +@TableName("data_service_api_auth") public class DataServiceApiAuthEntity extends BaseEntity { + + /** * app的id */ diff --git a/srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceApiLogEntity.java b/srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceApiLogEntity.java index 1fa6add..2edd578 100644 --- a/srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceApiLogEntity.java +++ b/srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceApiLogEntity.java @@ -13,7 +13,7 @@ import net.srt.framework.mybatis.entity.BaseEntity; */ @EqualsAndHashCode(callSuper = false) @Data -@TableName("data_service_api_log1") +@TableName("data_service_api_log") public class DataServiceApiLogEntity extends BaseEntity { /** * url diff --git a/srt-cloud-data-service/src/main/java/net/srt/service/ApiConfigService.java b/srt-cloud-data-service/src/main/java/net/srt/service/ApiConfigService.java index 3f16a51..991679c 100644 --- a/srt-cloud-data-service/src/main/java/net/srt/service/ApiConfigService.java +++ b/srt-cloud-data-service/src/main/java/net/srt/service/ApiConfigService.java @@ -7,6 +7,7 @@ import net.srt.framework.common.page.PageResult; import net.srt.framework.mybatis.service.BaseService; import net.srt.query.ApiConfigQuery; import net.srt.vo.ApiConfigVo; +import net.srt.vo.DataServiceApiAuthVo; import srt.cloud.framework.dbswitch.core.model.JdbcSelectResult; import javax.servlet.http.HttpServletRequest; @@ -37,4 +38,10 @@ public interface ApiConfigService extends BaseService { JdbcSelectResult sqlExecute(SqlDto dto); void exportDocs(List ids, HttpServletResponse response); + + void upAuth(DataServiceApiAuthVo authVO); + + DataServiceApiAuthVo getAuthInfo(Long authId); + + void resetRequested(Long authId); } diff --git a/srt-cloud-data-service/src/main/java/net/srt/service/impl/ApiConfigServiceImpl.java b/srt-cloud-data-service/src/main/java/net/srt/service/impl/ApiConfigServiceImpl.java index 65d63b0..67474b2 100644 --- a/srt-cloud-data-service/src/main/java/net/srt/service/impl/ApiConfigServiceImpl.java +++ b/srt-cloud-data-service/src/main/java/net/srt/service/impl/ApiConfigServiceImpl.java @@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.AllArgsConstructor; import net.srt.api.ServerNames; import net.srt.convert.ApiConfigConvert; +import net.srt.convert.DataServiceApiAuthConvert; import net.srt.dao.ApiConfigDao; import net.srt.dao.ApiGroupDao; +import net.srt.dao.DataServiceApiAuthDao; import net.srt.dto.SqlDto; import net.srt.entity.ApiConfigEntity; import net.srt.entity.ApiGroupEntity; +import net.srt.entity.DataServiceApiAuthEntity; import net.srt.framework.common.constant.Constant; import net.srt.framework.common.page.PageResult; import net.srt.framework.mybatis.service.impl.BaseServiceImpl; @@ -18,6 +21,7 @@ import net.srt.framework.security.user.SecurityUser; import net.srt.query.ApiConfigQuery; import net.srt.service.ApiConfigService; import net.srt.vo.ApiConfigVo; +import net.srt.vo.DataServiceApiAuthVo; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.http.HttpStatus; @@ -42,6 +46,7 @@ public class ApiConfigServiceImpl extends BaseServiceImpl mappings = new ConcurrentHashMap<>(); @Override public String getIpPort() { @@ -168,6 +173,22 @@ public class ApiConfigServiceImpl extends BaseServiceImpl page(ApiConfigQuery query) { // 查询参数 diff --git a/srt-cloud-data-service/src/main/java/net/srt/service/impl/DataServiceAppServiceImpl.java b/srt-cloud-data-service/src/main/java/net/srt/service/impl/DataServiceAppServiceImpl.java index 7f8fab4..3a268b6 100644 --- a/srt-cloud-data-service/src/main/java/net/srt/service/impl/DataServiceAppServiceImpl.java +++ b/srt-cloud-data-service/src/main/java/net/srt/service/impl/DataServiceAppServiceImpl.java @@ -53,6 +53,7 @@ public class DataServiceAppServiceImpl extends BaseServiceImpl update data_service_api_config set auth_id=#{apiId} where id=#{id} + + update data_service_api_config set auth_id=null where auth_id=#{authId} +