diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..0063ccc --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/cloud-market-common/src/main/java/com/muyu/market/domian/Connertor.java b/cloud-market-common/src/main/java/com/muyu/market/domian/Connertor.java new file mode 100644 index 0000000..5f849d7 --- /dev/null +++ b/cloud-market-common/src/main/java/com/muyu/market/domian/Connertor.java @@ -0,0 +1,44 @@ +package com.muyu.market.domian; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName(value = "rule", autoResultMap = true) +public class Connertor extends BaseEntity { + + /** + * 主键 + */ + @TableId(value = "connector_id" ,type = IdType.AUTO) + private Long connectorId; + /** + * 接口名称 + */ + private String connectorName; + /** + * 接口描述 + */ + private String connectorDescription; + /** + * 接口使用量 + */ + private Integer connectorNum; + /** + * 状态 + */ + private Integer status; + + +} diff --git a/cloud-market-common/src/main/java/com/muyu/market/domian/Defined.java b/cloud-market-common/src/main/java/com/muyu/market/domian/Defined.java index 8bc2174..7db26a0 100644 --- a/cloud-market-common/src/main/java/com/muyu/market/domian/Defined.java +++ b/cloud-market-common/src/main/java/com/muyu/market/domian/Defined.java @@ -28,30 +28,47 @@ import java.util.Date; @TableName(value = "defined", autoResultMap = true) public class Defined extends BaseEntity { + /** + * 主键 + */ @TableId(value = "defined_id" ,type = IdType.AUTO) private Long definedId ; - /** 定义名称 */ + /** + * 定义名称 + */ private String definedName ; - /** 描述 */ + /** + * 描述 + */ private String definedDescription ; - /** 接口分配 */ + /** + * 接口分配 + */ private String definedAllot ; - /** 有效期(天） */ - private Date definedDateValidity ; - /** 接口类型 */ - private Long definedTypeId ; - /** 接口使用量 */ + /** + * 有效期(天） + */ + private Integer definedDateValidity ; + /** + * 接口类型 + */ + private Integer typeId ; + /** + * 接口使用量 + */ private Integer interfaceNum ; - /** 接口来源 */ + /** + * 接口来源 + */ private String definedSource ; - /** 使用模板 */ - private String definedStencil ; - /** 开发人员 */ - private String definedManpower ; - /** 状态 */ - private String state ; + /** + * 开发人员 + */ + private String definedPeople; + /** + * 状态 + */ + private Integer status ; + - public Defined getDefinedName(Defined defined) { - return defined; - } } diff --git a/cloud-market-common/src/main/java/com/muyu/market/domian/Logs.java b/cloud-market-common/src/main/java/com/muyu/market/domian/Logs.java new file mode 100644 index 0000000..9a36964 --- /dev/null +++ b/cloud-market-common/src/main/java/com/muyu/market/domian/Logs.java @@ -0,0 +1,43 @@ +package com.muyu.market.domian; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName(value = "rule", autoResultMap = true) +public class Logs extends BaseEntity { + + /** + * 主键 + */ + @TableId(value = "logs_id" ,type = IdType.AUTO) + private Long logsId; + /** + * 用户名id + */ + private Integer userId; + /** + * 类型id + */ + private Integer typeId; + /** + * 操作时间 + */ + private Date logsTime; + + + +} diff --git a/cloud-market-common/src/main/java/com/muyu/market/domian/Pay.java b/cloud-market-common/src/main/java/com/muyu/market/domian/Pay.java new file mode 100644 index 0000000..ccb25f9 --- /dev/null +++ b/cloud-market-common/src/main/java/com/muyu/market/domian/Pay.java @@ -0,0 +1,45 @@ +package com.muyu.market.domian; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName(value = "pay", autoResultMap = true) +public class Pay extends BaseEntity { + + /** + * 主键 + */ + @TableId(value = "pay_id" ,type = IdType.AUTO) + private Long payId; + /** + * 支付类型 + */ + private Integer payType; + /** + * 支付状态 + */ + private Integer payStatus; + /** + * 登录人员 + */ + private Integer userId; + /** + * 支付时间 + */ + private Date payTime; + +} diff --git a/cloud-market-common/src/main/java/com/muyu/market/domian/Rule.java b/cloud-market-common/src/main/java/com/muyu/market/domian/Rule.java index 404c6e7..c9cdb77 100644 --- a/cloud-market-common/src/main/java/com/muyu/market/domian/Rule.java +++ b/cloud-market-common/src/main/java/com/muyu/market/domian/Rule.java @@ -30,9 +30,9 @@ public class Rule extends BaseEntity { /** 规则代码 */ private String ruleCode ; /** 规则描述 */ - private String ruleDescribe ; + private String ruleDescription ; /** 规则状态 */ - private Integer state ; + private Integer status ; /** 使用次数 */ private Integer ruleNum ; diff --git a/cloud-market-common/src/main/java/com/muyu/market/domian/Type.java b/cloud-market-common/src/main/java/com/muyu/market/domian/Type.java index fe07a63..6d6c471 100644 --- a/cloud-market-common/src/main/java/com/muyu/market/domian/Type.java +++ b/cloud-market-common/src/main/java/com/muyu/market/domian/Type.java @@ -23,16 +23,32 @@ import lombok.experimental.SuperBuilder; @EqualsAndHashCode(callSuper = true) @TableName(value = "type", autoResultMap = true) public class Type extends BaseEntity { + + /** + * 主键 + */ @TableId(value = "type_id" ,type = IdType.AUTO) - private Long typeId ; - /** 类型名称 */ - private String typeName ; - /** 接口列 */ - private String typeBar ; - /** 类型描述 */ - private String typeSpecification ; - /** 接口数量 */ - private Integer typeNum ; - /** 调用次数 */ - private Integer typeNumber ; + private Long typeId; + /** + * 类型名称 + */ + private String typeName; + /** + * 描述 + */ + private String typeDescription; + /** + * 使用数量 + */ + private Integer typeNum; + /** + * 调用次数 + */ + private Integer typeNumber; + +// private String createBy; +// private String createTime; +// private String updateBy; +// private String updateTime; + } diff --git a/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java b/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java index ab611b0..026024c 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java +++ b/cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java @@ -31,49 +31,50 @@ import java.util.List; @Tag(name = "定义接口控制层",description = "进行客户管理，查看等相关操作") public class DefinedController { - /** - * 接口业务层 - */ - @Autowired - private DefinedService definedService; - /** - * 接口列表 - */ - @RequestMapping(path = "/list",method = RequestMethod.POST) - @Operation(summary = "查询",description = "根据接口的名称、编码，是否开启等可以进行筛选") - public Result> selectList( - @Validated @RequestBody Defined defined) { - return Result.success( - definedService.selectList(defined) - ); - } - - - /** - * 接口添加 - */ - @PostMapping - @Operation(summary = "添加", description = "根据接口实体类添加，添加成功之后才可以使用支付类产品") - public Result save(@Validated @RequestBody Defined defined) { - definedService.save(defined); - return Result.success(); - } - - - /** - * 接口修改 - */ - @PutMapping("/{definedId}") - @Operation(summary = "修改", description = "通过ID修改信息") - public Result updateById( - @Validated @RequestBody Defined defined, - @Schema(title = "ID", defaultValue = "1", type = "Long", description = "修改信息所需的唯一条件") - @PathVariable("definedId") Long definedId) { - - definedService.updateById(defined); - return Result.success(); - } +// /** +// * 接口业务层 +// */ +// @Autowired +// private DefinedService definedService; +// +// /** +// * 接口列表 +// */ +// @RequestMapping(path = "/list",method = RequestMethod.POST) +// @Operation(summary = "查询",description = "根据接口的名称、编码，是否开启等可以进行筛选") +// public Result> selectList( +// @Validated @RequestBody Defined defined) { +// return Result.success( +// definedService.selectList(defined) +// ); +// } +// +// +// /** +// * 接口添加 +// */ +// @PostMapping +// @Operation(summary = "添加", description = "根据接口实体类添加，添加成功之后才可以使用支付类产品") +// public Result save(@Validated @RequestBody Defined defined) { +// definedService.save(defined); +// return Result.success(); +// } +// +// +// /** +// * 接口修改 +// */ +// @PutMapping("/{definedId}") +// @Operation(summary = "修改", description = "通过ID修改信息") +// public Result updateById( +// @Validated @RequestBody Defined defined, +// @Schema(title = "ID", defaultValue = "1", type = "Long", description = "修改信息所需的唯一条件") +// @PathVariable("definedId") Long definedId) { +// +// definedService.updateById(defined); +// return Result.success(); +// } } diff --git a/cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java b/cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java index 138dcfe..1138e0a 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java +++ b/cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java @@ -13,6 +13,5 @@ import java.util.List; * @Date：2024/8/20 14:48 */ public interface DefinedService extends IService { - List selectList(Defined defined); } diff --git a/cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java b/cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java index a432047..4204ce1 100644 --- a/cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java +++ b/cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java @@ -30,20 +30,5 @@ public class DefinedServiceImpl private DefinedMapper definedMapper; - @Override - public List selectList(Defined defined) { - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.like( - StringUtils.isNotEmpty(defined.getDefinedName()), - defined::getDefinedName, defined.getDefinedName() - - ); - - return this.list(queryWrapper) - .stream() - .toList(); - } - }