diff --git a/srt-cloud-data-governance/src/main/java/net/srt/GovernanceApplication.java b/srt-cloud-data-governance/src/main/java/net/srt/GovernanceApplication.java index 00deed4..65f1dee 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/GovernanceApplication.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/GovernanceApplication.java @@ -1,5 +1,6 @@ package net.srt; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; diff --git a/srt-cloud-data-governance/src/main/java/net/srt/controller/MetadataController.java b/srt-cloud-data-governance/src/main/java/net/srt/controller/MetadataController.java index 5ee1dc7..916b7a8 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/controller/MetadataController.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/MetadataController.java @@ -1,5 +1,6 @@ package net.srt.controller; + import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -19,6 +20,12 @@ import java.util.List; * @Author: jpz * @CreateTime: 2023/12/24 14:24 */ +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import net.srt.service.MetadataService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + @RestController @RequestMapping("metadata") @Tag(name = "数据治理-元数据") @@ -93,4 +100,5 @@ public class MetadataController { + } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/controller/StandardStopwatchController.java b/srt-cloud-data-governance/src/main/java/net/srt/controller/StandardStopwatchController.java new file mode 100644 index 0000000..8ce3bd2 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/StandardStopwatchController.java @@ -0,0 +1,70 @@ +package net.srt.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import net.srt.convert.StandardStopwatchConvert; +import net.srt.entity.StandardStopwatchEntity; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.common.utils.Result; +import net.srt.query.StandardStopwatchQuery; +import net.srt.service.StandardStopwatchService; +import net.srt.vo.StandardStopwatchVo; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * @ClassName : StandardStopwatchController + * @Description : + * @Author : FJJ + * @Date: 2023-12-24 10:32 + */ +@RestController +@RequestMapping("/standard-code") +@Tag(name="数据治理-标准码表数据") +@AllArgsConstructor +public class StandardStopwatchController { + private final StandardStopwatchService standardStopwatchService; + + @GetMapping("page") + @Operation(summary = "分页") + public Result> page(@Valid StandardStopwatchQuery query){ + PageResult page = standardStopwatchService.page(query); + + return Result.ok(page); + } + + @GetMapping("{id}") + @Operation(summary = "信息") + public Result get(@PathVariable("id") Long id){ + StandardStopwatchEntity entity = standardStopwatchService.getById(id); + + return Result.ok(StandardStopwatchConvert.INSTANCE.convert(entity)); + } + + @PostMapping + @Operation(summary = "保存") + public Result save(@RequestBody StandardStopwatchVo vo){ + standardStopwatchService.save(vo); + + return Result.ok(); + } + + @PutMapping + @Operation(summary = "修改") + public Result update(@RequestBody @Valid StandardStopwatchVo vo){ + standardStopwatchService.update(vo); + + return Result.ok(); + } + + @DeleteMapping + @Operation(summary = "删除") + public Result delete(@RequestBody List idList){ + standardStopwatchService.delete(idList); + + return Result.ok(); + } +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/convert/StandardStopwatchConvert.java b/srt-cloud-data-governance/src/main/java/net/srt/convert/StandardStopwatchConvert.java new file mode 100644 index 0000000..367d57e --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/convert/StandardStopwatchConvert.java @@ -0,0 +1,25 @@ +package net.srt.convert; + +import net.srt.entity.StandardStopwatchEntity; +import net.srt.vo.StandardStopwatchVo; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * @ClassName : StandardStopwatchConvert + * @Description : + * @Author : FJJ + * @Date: 2023-12-24 10:33 + */ +@Mapper +public interface StandardStopwatchConvert { + StandardStopwatchConvert INSTANCE = Mappers.getMapper(StandardStopwatchConvert.class); + + StandardStopwatchEntity convert(StandardStopwatchVo vo); + + StandardStopwatchVo convert(StandardStopwatchEntity entity); + + List convertList(List list); +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/dao/StandardStopwatchDao.java b/srt-cloud-data-governance/src/main/java/net/srt/dao/StandardStopwatchDao.java new file mode 100644 index 0000000..018f5a0 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/dao/StandardStopwatchDao.java @@ -0,0 +1,17 @@ +package net.srt.dao; + +import net.srt.entity.StandardStopwatchEntity; +import net.srt.framework.mybatis.dao.BaseDao; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @ClassName : StandardStopwatchDao + * @Description : + * @Author : FJJ + * @Date: 2023-12-24 10:33 + */ +@Mapper +public interface StandardStopwatchDao extends BaseDao { + void updateCodeNumByStandardId(@Param("standardId") Long standardId); +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/entity/StandardStopwatchEntity.java b/srt-cloud-data-governance/src/main/java/net/srt/entity/StandardStopwatchEntity.java new file mode 100644 index 0000000..bbc0670 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/entity/StandardStopwatchEntity.java @@ -0,0 +1,37 @@ +package net.srt.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import net.srt.framework.mybatis.entity.BaseEntity; + +/** + * @ClassName : StandardStopwatchEntity + * @Description : + * @Author : FJJ + * @Date: 2023-12-24 10:30 + */ +@EqualsAndHashCode(callSuper = false) +@Data +@TableName("data_standard_stopwatch") +public class StandardStopwatchEntity extends BaseEntity { + + /** + * 标准码表id + */ + private Long standardId; + + /** + * 码表数据的id + */ + private String dataId; + + /** + * 码表数据的name + */ + private String dataName; + + + private Long projectId; + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/query/StandardStopwatchQuery.java b/srt-cloud-data-governance/src/main/java/net/srt/query/StandardStopwatchQuery.java new file mode 100644 index 0000000..24ce0b3 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/query/StandardStopwatchQuery.java @@ -0,0 +1,21 @@ +package net.srt.query; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import net.srt.framework.common.query.Query; + +/** + * @ClassName : StandardStopwatchQuery + * @Description : + * @Author : FJJ + * @Date: 2023-12-24 10:29 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Schema(description = "数据治理-标准码表数据查询") +public class StandardStopwatchQuery extends Query { + private Integer standardId; + private String dataId; + private String dataName; +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/StandardStopwatchService.java b/srt-cloud-data-governance/src/main/java/net/srt/service/StandardStopwatchService.java new file mode 100644 index 0000000..add6057 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/StandardStopwatchService.java @@ -0,0 +1,25 @@ +package net.srt.service; + +import net.srt.entity.StandardStopwatchEntity; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.mybatis.service.BaseService; +import net.srt.query.StandardStopwatchQuery; +import net.srt.vo.StandardStopwatchVo; + +import java.util.List; + +/** + * @ClassName : StandardStopwatchService + * @Description : + * @Author : FJJ + * @Date: 2023-12-24 10:32 + */ +public interface StandardStopwatchService extends BaseService { + PageResult page(StandardStopwatchQuery query); + + void save(StandardStopwatchVo vo); + + void update(StandardStopwatchVo vo); + + void delete(List idList); +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetadataServiceImpl.java b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetadataServiceImpl.java new file mode 100644 index 0000000..1e64ca1 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetadataServiceImpl.java @@ -0,0 +1,12 @@ +package net.srt.service.impl; + +import io.swagger.v3.oas.annotations.servers.Server; +import lombok.AllArgsConstructor; +import net.srt.dao.MetadataDao; +import net.srt.entity.MetadataEntity; +import net.srt.framework.mybatis.service.impl.BaseServiceImpl; +import net.srt.service.MetadataService; +@Server +@AllArgsConstructor +public class MetadataServiceImpl extends BaseServiceImpl implements MetadataService { +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/StandardStopwatchServiceImpl.java b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/StandardStopwatchServiceImpl.java new file mode 100644 index 0000000..ce7c0f5 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/StandardStopwatchServiceImpl.java @@ -0,0 +1,67 @@ +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.StandardStopwatchConvert; +import net.srt.dao.StandardStopwatchDao; +import net.srt.entity.StandardStopwatchEntity; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.mybatis.service.impl.BaseServiceImpl; +import net.srt.query.StandardStopwatchQuery; +import net.srt.service.StandardStopwatchService; +import net.srt.vo.StandardStopwatchVo; +import org.springframework.stereotype.Service; +import srt.cloud.framework.dbswitch.common.util.StringUtil; + +import java.util.List; + +/** + * @ClassName : StandardStopwatchServiceImpl + * @Description : + * @Author : FJJ + * @Date: 2023-12-24 10:32 + */ +@Service +@AllArgsConstructor +public class StandardStopwatchServiceImpl extends BaseServiceImpl implements StandardStopwatchService { + private final StandardStopwatchDao standardStopwatchDao; + @Override + public PageResult page(StandardStopwatchQuery query) { + IPage page = baseMapper.selectPage(getPage(query), getWrapper(query)); + + return new PageResult<>(StandardStopwatchConvert.INSTANCE.convertList(page.getRecords()), page.getTotal()); + } + + private LambdaQueryWrapper getWrapper(StandardStopwatchQuery query) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(query.getStandardId() != null, StandardStopwatchEntity::getStandardId, query.getStandardId()) + .eq(StringUtil.isNotBlank(query.getDataId()), StandardStopwatchEntity::getDataId, query.getDataId()) + .eq(StringUtil.isNotBlank(query.getDataName()), StandardStopwatchEntity::getDataName, query.getDataName()); + return wrapper; + } + + @Override + public void save(StandardStopwatchVo vo) { + StandardStopwatchEntity entity =StandardStopwatchConvert.INSTANCE.convert(vo); + entity.setProjectId(getProjectId()); + baseMapper.insert(entity); + standardStopwatchDao.updateCodeNumByStandardId(vo.getStandardId()); + } + + @Override + public void update(StandardStopwatchVo vo) { + StandardStopwatchEntity entity = StandardStopwatchConvert.INSTANCE.convert(vo); + entity.setProjectId(getProjectId()); + updateById(entity); + } + + @Override + public void delete(List idList) { + Long id = idList.get(0); + StandardStopwatchEntity standardCodeEntity = baseMapper.selectById(id); + removeByIds(idList); + standardStopwatchDao.updateCodeNumByStandardId(standardCodeEntity.getStandardId()); + } +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/vo/StandardStopwatchVo.java b/srt-cloud-data-governance/src/main/java/net/srt/vo/StandardStopwatchVo.java new file mode 100644 index 0000000..cee9474 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/vo/StandardStopwatchVo.java @@ -0,0 +1,56 @@ +package net.srt.vo; + +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; + +/** + * @ClassName : StandardStopwatchVo + * @Description : + * @Author : FJJ + * @Date: 2023-12-24 10:26 + */ +@Data +@Schema(description = "数据治理-标准码表数据") +public class StandardStopwatchVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "主键id") + private Long id; + + @Schema(description = "标准码表id") + private Long standardId; + + @Schema(description = "码表数据的id") + private String dataId; + + @Schema(description = "码表数据的name") + private String dataName; + + private Long projectId; + + @Schema(description = "版本号") + private Integer version; + + @Schema(description = "删除标识 0：正常 1：已删除") + private Integer deleted; + + @Schema(description = "创建者") + private Long creator; + + @Schema(description = "创建时间") + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date createTime; + + @Schema(description = "更新者") + private Long updater; + + @Schema(description = "更新时间") + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date updateTime; + +} diff --git a/srt-cloud-data-governance/src/main/resources/mapper/StandardStopwatchMapper.xml b/srt-cloud-data-governance/src/main/resources/mapper/StandardStopwatchMapper.xml new file mode 100644 index 0000000..445ce80 --- /dev/null +++ b/srt-cloud-data-governance/src/main/resources/mapper/StandardStopwatchMapper.xml @@ -0,0 +1,14 @@ + + + + + + + UPDATE data_governance_standard SET code_num=(SELECT COUNT(1) + FROM data_governance_standard_code + WHERE standard_id=#{standardId} AND deleted=0) + WHERE id=#{standardId} + + diff --git a/srt-cloud-data-service/pom.xml b/srt-cloud-data-service/pom.xml index f1b90b9..9f5a8d8 100644 --- a/srt-cloud-data-service/pom.xml +++ b/srt-cloud-data-service/pom.xml @@ -79,6 +79,12 @@ io.minio minio + + org.apache.ant + ant + 1.9.1 + compile + 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 333fe3a..e138804 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 @@ -3,18 +3,16 @@ package net.srt.controller; import io.swagger.v3.oas.annotations.Operation; import lombok.AllArgsConstructor; import net.srt.convert.DataServiceAppConvert; -import net.srt.entity.DataServiceApppEntity; +import net.srt.entity.DataServiceAppEntity; import net.srt.framework.common.page.PageResult; import net.srt.framework.common.utils.Result; import net.srt.query.DataServiceAppQuery; import net.srt.service.DataServiceAppService; import net.srt.vo.DataServiceAppVo; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.List; /** * @ClassName : DataServiceAppController @@ -37,7 +35,50 @@ public class DataServiceAppController { @GetMapping("{id}") @Operation(summary = "信息") public Result get(@PathVariable("id") Long id){ - DataServiceApppEntity dataServiceApppEntity = dataServiceAppService.getById(id); - return Result.ok(DataServiceAppConvert.INSTANCE.convert(dataServiceApppEntity)); + DataServiceAppEntity dataServiceAppEntity = dataServiceAppService.getById(id); + return Result.ok(DataServiceAppConvert.INSTANCE.convert(dataServiceAppEntity)); + } + + @PostMapping + @Operation(summary = "保存") + public Result save(@RequestBody DataServiceAppVo vo){ + dataServiceAppService.save1(vo); + return Result.ok(); + } + + @PutMapping + @Operation(summary = "修改") + public Result update(@RequestBody @Valid DataServiceAppVo vo){ + dataServiceAppService.update1(vo); + return Result.ok(); + } + + @DeleteMapping + @Operation(summary = "删除") + public Result delete(@RequestBody List idList){ + dataServiceAppService.delete(idList); + + return Result.ok(); + } + + @PostMapping("/auth") + @Operation(summary = "添加授权") + public Result addAuth(@RequestBody DataServiceAppVo authVO){ + dataServiceAppService.addAuth(authVO); + return Result.ok(); + } + + @PutMapping("/auth") + @Operation(summary = "修改授权") + public Result upAuth(@RequestBody DataServiceAppVo authVO){ + dataServiceAppService.upAuth(authVO); + return Result.ok(); + } + + @DeleteMapping("/cancel-auth/{authId}") + @Operation(summary = "取消授权") + public Result cancelAuth(@PathVariable Long authId){ + dataServiceAppService.cancelAuth(authId); + return Result.ok(); } } diff --git a/srt-cloud-data-service/src/main/java/net/srt/convert/DataServiceAppConvert.java b/srt-cloud-data-service/src/main/java/net/srt/convert/DataServiceAppConvert.java index 4a8d8bd..3abbab9 100644 --- a/srt-cloud-data-service/src/main/java/net/srt/convert/DataServiceAppConvert.java +++ b/srt-cloud-data-service/src/main/java/net/srt/convert/DataServiceAppConvert.java @@ -1,8 +1,8 @@ package net.srt.convert; -import net.srt.entity.DataServiceApppEntity; +import net.srt.entity.DataServiceAppEntity; import net.srt.vo.DataServiceAppVo; -import org.apache.ibatis.annotations.Mapper; +import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; import java.util.List; @@ -17,9 +17,9 @@ import java.util.List; public interface DataServiceAppConvert { DataServiceAppConvert INSTANCE = Mappers.getMapper(DataServiceAppConvert.class); - DataServiceApppEntity convert(DataServiceAppVo vo); + DataServiceAppEntity convert(DataServiceAppVo vo); - DataServiceAppVo convert(DataServiceApppEntity entity); + DataServiceAppVo convert(DataServiceAppEntity entity); - List convertList(List list); + List convertList(List list); } diff --git a/srt-cloud-data-service/src/main/java/net/srt/dao/DataServiceAppDao.java b/srt-cloud-data-service/src/main/java/net/srt/dao/DataServiceAppDao.java index 6b1f886..f93a261 100644 --- a/srt-cloud-data-service/src/main/java/net/srt/dao/DataServiceAppDao.java +++ b/srt-cloud-data-service/src/main/java/net/srt/dao/DataServiceAppDao.java @@ -1,6 +1,6 @@ package net.srt.dao; -import net.srt.entity.DataServiceApppEntity; +import net.srt.entity.DataServiceAppEntity; import net.srt.framework.mybatis.dao.BaseDao; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Param; * @Date: 2023-12-23 08:59 */ @Mapper -public interface DataServiceAppDao extends BaseDao { - DataServiceApppEntity selectByApplyId(@Param("applyId") Long applyId); +public interface DataServiceAppDao extends BaseDao { + DataServiceAppEntity selectByApplyId(@Param("applyId") Long applyId); } diff --git a/srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceApiAuthEnitiy.java b/srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceApiAuthEnitiy.java new file mode 100644 index 0000000..852114f --- /dev/null +++ b/srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceApiAuthEnitiy.java @@ -0,0 +1,70 @@ +//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 lombok.Data; +//import lombok.EqualsAndHashCode; +//import net.srt.framework.mybatis.entity.BaseEntity; +// +//import java.util.Date; +// +///** +// * @ClassName : DataServiceApiAuthEnitiy +// * @Description : +// * @Author : FJJ +// * @Date: 2023-12-24 11:30 +// */ +//@EqualsAndHashCode(callSuper=false) +//@Data +//@TableName("data_service_api_auth1") +//public class DataServiceApiAuthEnitiy extends BaseEntity { +// +// /** +// * app的id +// */ +// private Long appId; +// +// /** +// * 分组id +// */ +// private Long groupId; +// +// /** +// * api的id +// */ +// private Long apiId; +// +// /** +// * 调用次数 不限次数为-1 +// */ +// private Integer requestTimes; +// +// @TableField(updateStrategy = FieldStrategy.IGNORED) +// private Date startTime; +// @TableField(updateStrategy = FieldStrategy.IGNORED) +// private Date endTime; +// +// /** +// * 已调用次数 +// */ +// @TableField(updateStrategy = FieldStrategy.NEVER) +// private Integer requestedTimes; +// @TableField(updateStrategy = FieldStrategy.NEVER) +// private Integer requestedSuccessTimes; +// @TableField(updateStrategy = FieldStrategy.NEVER) +// private Integer requestedFailedTimes; +// +// /** +// * 所属项目id +// */ +// private Long projectId; +// +// /** +// * 真删 +// */ +// @TableField(fill = FieldFill.INSERT) +// private Integer deleted; +// +//} diff --git a/srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceApppEntity.java b/srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceAppEntity.java similarity index 62% rename from srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceApppEntity.java rename to srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceAppEntity.java index 116252b..0049b7e 100644 --- a/srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceApppEntity.java +++ b/srt-cloud-data-service/src/main/java/net/srt/entity/DataServiceAppEntity.java @@ -1,11 +1,16 @@ 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 io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import net.srt.framework.mybatis.entity.BaseEntity; +import java.util.Date; + /** * @ClassName : DataServiceApppEntity * @Description : @@ -15,21 +20,30 @@ import net.srt.framework.mybatis.entity.BaseEntity; @EqualsAndHashCode(callSuper = false) @Data @TableName("data_service_app") -public class DataServiceApppEntity extends BaseEntity { - - @Schema(description = "名称") +public class DataServiceAppEntity extends BaseEntity { + /** + * 名称 + */ private String name; - @Schema(description = "备注") + /** + * 备注 + */ private String note; - @Schema(description = "app_key") + /** + * app_key + */ private String appKey; - @Schema(description = "app_secret") + /** + * app_secret + */ private String appSecret; - @Schema(description = "过期描述") + /** + * 过期描述 + */ private String expireDesc; /** @@ -39,6 +53,13 @@ public class DataServiceApppEntity extends BaseEntity { private Integer ifMarket; - @Schema(description = "所属项目id") + /** + * 所属项目id + */ private Long projectId; + + + + + } diff --git a/srt-cloud-data-service/src/main/java/net/srt/service/DataServiceAppService.java b/srt-cloud-data-service/src/main/java/net/srt/service/DataServiceAppService.java index ee05f4d..d0c4606 100644 --- a/srt-cloud-data-service/src/main/java/net/srt/service/DataServiceAppService.java +++ b/srt-cloud-data-service/src/main/java/net/srt/service/DataServiceAppService.java @@ -1,17 +1,31 @@ package net.srt.service; -import net.srt.entity.DataServiceApppEntity; +import net.srt.entity.DataServiceAppEntity; import net.srt.framework.common.page.PageResult; import net.srt.framework.mybatis.service.BaseService; import net.srt.query.DataServiceAppQuery; import net.srt.vo.DataServiceAppVo; +import java.util.List; + /** * @ClassName : DataServiceAppService * @Description : * @Author : FJJ * @Date: 2023-12-23 08:53 */ -public interface DataServiceAppService extends BaseService { +public interface DataServiceAppService extends BaseService { PageResult page(DataServiceAppQuery query); + + void save1(DataServiceAppVo vo); + + void update1(DataServiceAppVo vo); + + void delete(List idList); + + void addAuth(DataServiceAppVo authVO); + + void upAuth(DataServiceAppVo authVO); + + void cancelAuth(Long authId); } 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 a605d3a..a4e251c 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 @@ -6,7 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.AllArgsConstructor; import net.srt.convert.DataServiceAppConvert; import net.srt.dao.DataServiceAppDao; -import net.srt.entity.DataServiceApppEntity; +import net.srt.entity.DataServiceAppEntity; +import net.srt.framework.common.exception.ServerException; import net.srt.framework.common.page.PageResult; import net.srt.framework.mybatis.service.impl.BaseServiceImpl; import net.srt.framework.security.user.SecurityUser; @@ -27,32 +28,57 @@ import java.util.List; */ @Service @AllArgsConstructor -public class DataServiceAppServiceImpl extends BaseServiceImpl implements DataServiceAppService { +public class DataServiceAppServiceImpl extends BaseServiceImpl implements DataServiceAppService { + private final DataServiceAppDao dataServiceAppDao; @Override public PageResult page(DataServiceAppQuery query) { - if (query.getApplyId()!=null){ - DataServiceApppEntity dataServiceApppEntity=baseMapper.selectByApplyId(query.getApplyId()); - List list=new ArrayList<>(1); - if (dataServiceApppEntity!=null){ - list.add(dataServiceApppEntity); - return new PageResult<>(DataServiceAppConvert.INSTANCE.convertList(list),1); - } - return new PageResult<>(new ArrayList<>(),0); - - } - IPage page=baseMapper.selectPage(getPage(query),getWrapper(query)); + IPage page=baseMapper.selectPage(getPage(query),null); return new PageResult<>(DataServiceAppConvert.INSTANCE.convertList(page.getRecords()),page.getTotal()); } - - private LambdaQueryWrapper getWrapper(DataServiceAppQuery query) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.like(StringUtil.isNotBlank(query.getName()), DataServiceApppEntity::getName, query.getName()) - .eq(DataServiceApppEntity::getIfMarket, query.getIfMarket() != null ? query.getIfMarket() : 0) - .eq(query.getIfMarket() != null, DataServiceApppEntity::getCreator, SecurityUser.getUserId()) - .eq(StringUtil.isNotBlank(query.getAppKey()), DataServiceApppEntity::getAppKey, query.getAppKey()) - .orderByDesc(DataServiceApppEntity::getCreateTime).orderByDesc(DataServiceApppEntity::getId); - dataScopeWithoutOrgId(wrapper); - return wrapper; + @Override + public void save1(DataServiceAppVo vo) { + DataServiceAppEntity app = DataServiceAppConvert.INSTANCE.convert(vo); + baseMapper.insert(app); } + + + + @Override + public void update1(DataServiceAppVo vo) { + DataServiceAppEntity app = DataServiceAppConvert.INSTANCE.convert(vo); + updateById(app); + } + + @Override + public void delete(List idList) { + removeByIds(idList); + } + + @Override + public void addAuth(DataServiceAppVo authVO) { + authVO.setProjectId(getProjectId()); + dataServiceAppDao.insert(DataServiceAppConvert.INSTANCE.convert(authVO)); + } + + @Override + public void upAuth(DataServiceAppVo authVO) { + dataServiceAppDao.updateById(DataServiceAppConvert.INSTANCE.convert(authVO)); + } + + @Override + public void cancelAuth(Long authId) { + dataServiceAppDao.deleteById(authId); + } + + +// private LambdaQueryWrapper getWrapper(DataServiceAppQuery query) { +// LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); +// wrapper.like(StringUtil.isNotBlank(query.getName()), DataServiceAppEntity::getName, query.getName()) +// .eq(DataServiceAppEntity::getIfMarket, query.getIfMarket() != null ? query.getIfMarket() : 0) +// .eq(query.getIfMarket() != null, DataServiceAppEntity::getCreator, SecurityUser.getUserId()) +// .eq(StringUtil.isNotBlank(query.getAppKey()), DataServiceAppEntity::getAppKey, query.getAppKey()) +// .orderByDesc(DataServiceAppEntity::getCreateTime).orderByDesc(DataServiceAppEntity::getId); +// return wrapper; +// } } diff --git a/srt-cloud-data-service/src/main/java/net/srt/vo/DataServiceApiAuthVo.java b/srt-cloud-data-service/src/main/java/net/srt/vo/DataServiceApiAuthVo.java new file mode 100644 index 0000000..bd53d79 --- /dev/null +++ b/srt-cloud-data-service/src/main/java/net/srt/vo/DataServiceApiAuthVo.java @@ -0,0 +1,70 @@ +package net.srt.vo; + +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; + +/** + * @ClassName : DataServiceApiAuthVo + * @Description : + * @Author : FJJ + * @Date: 2023-12-24 11:29 + */ +@Data +@Schema(description = "数据服务-权限关联表") +public class DataServiceApiAuthVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "主键id") + private Long id; + + @Schema(description = "app的id") + private Long appId; + + @Schema(description = "分组id") + private Long groupId; + + @Schema(description = "api的id") + private Long apiId; + + @Schema(description = "调用次数 不限次数为-1") + private Integer requestTimes; + + @Schema(description = "已调用次数") + private Integer requestedTimes; + private Integer requestedSuccessTimes; + private Integer requestedFailedTimes; + + @Schema(description = "所属项目id") + private Long projectId; + + @Schema(description = "版本号") + private Integer version; + + @Schema(description = "删除标识 0：正常 1：已删除") + private Integer deleted; + + @Schema(description = "创建者") + private Long creator; + + @Schema(description = "创建时间") + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date createTime; + + @Schema(description = "更新者") + private Long updater; + + @Schema(description = "更新时间") + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date updateTime; + + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date startTime; + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date endTime; + +} diff --git a/srt-cloud-data-service/src/main/resources/mapper/DataServiceAppMapper.xml b/srt-cloud-data-service/src/main/resources/mapper/DataServiceAppMapper.xml index 82cb89d..6271392 100644 --- a/srt-cloud-data-service/src/main/resources/mapper/DataServiceAppMapper.xml +++ b/srt-cloud-data-service/src/main/resources/mapper/DataServiceAppMapper.xml @@ -5,7 +5,7 @@ - SELECT dsa.* FROM data_service_app dsa INNER JOIN data_market_resource_apply dmra ON dsa.id=dmra.app_id WHERE dmra.id=#{applyId} diff --git a/srt-data-development/src/main/java/net/srt/disposition/vo/DataProductionTreeVo.java b/srt-data-development/src/main/java/net/srt/disposition/vo/DataProductionTreeVo.java index 24b24c1..d1e4ae4 100644 --- a/srt-data-development/src/main/java/net/srt/disposition/vo/DataProductionTreeVo.java +++ b/srt-data-development/src/main/java/net/srt/disposition/vo/DataProductionTreeVo.java @@ -11,8 +11,8 @@ import java.util.List; @Data public class DataProductionTreeVo { - private Integer id; - private Integer parentId; + private Long id; + private Long parentId; private Integer ifLeaf; private Long taskId; private String taskType;