From d0ac64e4c65c5bd2e3dddc2683b8443b00c25cb1 Mon Sep 17 00:00:00 2001 From: sy200 <2063514638@qq.com> Date: Thu, 22 Aug 2024 17:24:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9idea?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 --- .idea/encodings.xml | 7 --- .idea/misc.xml | 15 ------ .idea/uiDesigner.xml | 124 ------------------------------------------- .idea/vcs.xml | 6 --- 5 files changed, 160 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/misc.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml index a7e41ca..7609f41 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,17 +1,10 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 5d6b03c..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index ceccd91..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index dcb6b8c..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - From 11f819e4ba5b1ee0ede784222bb353b579bb186f Mon Sep 17 00:00:00 2001 From: sy200 <2063514638@qq.com> Date: Thu, 22 Aug 2024 20:53:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=A1=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/market/domian/Call.java | 44 ---------- .../com/muyu/market/domian/Configuration.java | 44 ---------- .../com/muyu/market/domian/Connertor.java | 44 ++++++++++ .../java/com/muyu/market/domian/Defined.java | 53 ++++++++---- .../com/muyu/market/domian/Interface.java | 29 ------- .../com/muyu/market/domian/InterfaceType.java | 29 ------- .../java/com/muyu/market/domian/Item.java | 37 -------- .../main/java/com/muyu/market/domian/Log.java | 54 ------------ .../java/com/muyu/market/domian/Logs.java | 43 ++++++++++ .../java/com/muyu/market/domian/Operate.java | 42 --------- .../main/java/com/muyu/market/domian/Pay.java | 45 ++++++++++ .../java/com/muyu/market/domian/Rule.java | 4 +- .../java/com/muyu/market/domian/Staff.java | 35 -------- .../java/com/muyu/market/domian/Type.java | 38 ++++++--- .../java/com/muyu/market/domian/User.java | 44 ---------- .../main/java/com/muyu/market/domian/Vip.java | 30 ------- .../master/controller/DefinedController.java | 85 ++++++++++--------- .../muyu/master/service/DefinedService.java | 1 - .../service/impl/DefinedServiceImpl.java | 15 ---- 19 files changed, 239 insertions(+), 477 deletions(-) delete mode 100644 cloud-market-common/src/main/java/com/muyu/market/domian/Call.java delete mode 100644 cloud-market-common/src/main/java/com/muyu/market/domian/Configuration.java create mode 100644 cloud-market-common/src/main/java/com/muyu/market/domian/Connertor.java delete mode 100644 cloud-market-common/src/main/java/com/muyu/market/domian/Interface.java delete mode 100644 cloud-market-common/src/main/java/com/muyu/market/domian/InterfaceType.java delete mode 100644 cloud-market-common/src/main/java/com/muyu/market/domian/Item.java delete mode 100644 cloud-market-common/src/main/java/com/muyu/market/domian/Log.java create mode 100644 cloud-market-common/src/main/java/com/muyu/market/domian/Logs.java delete mode 100644 cloud-market-common/src/main/java/com/muyu/market/domian/Operate.java create mode 100644 cloud-market-common/src/main/java/com/muyu/market/domian/Pay.java delete mode 100644 cloud-market-common/src/main/java/com/muyu/market/domian/Staff.java delete mode 100644 cloud-market-common/src/main/java/com/muyu/market/domian/User.java delete mode 100644 cloud-market-common/src/main/java/com/muyu/market/domian/Vip.java diff --git a/cloud-market-common/src/main/java/com/muyu/market/domian/Call.java b/cloud-market-common/src/main/java/com/muyu/market/domian/Call.java deleted file mode 100644 index 2894ebb..0000000 --- a/cloud-market-common/src/main/java/com/muyu/market/domian/Call.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.muyu.market.domian; - - - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -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; -/** - * @Author：ChenYan - * @Description 接口调用 - * @Date：2024/8/20 11:17 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "call", autoResultMap = true) -public class Call extends BaseEntity { - - @TableId(value = "call_id" ,type = IdType.AUTO) - private Long callId; - /** 接口名称 */ - private String callName ; - /** 接口使用量 */ - private Integer callUsage ; - /** 接口失败次数 */ - private Integer callFailNum ; - /** 接口成功次数 */ - private Integer callSucceedNum ; - /** 接口平均响应时间(毫秒) */ - private Double callMeanTime ; - /** 项目数量 */ - private Integer callItemNum ; - /** 所属项目 */ - private String callProject ; -} diff --git a/cloud-market-common/src/main/java/com/muyu/market/domian/Configuration.java b/cloud-market-common/src/main/java/com/muyu/market/domian/Configuration.java deleted file mode 100644 index 6c486fc..0000000 --- a/cloud-market-common/src/main/java/com/muyu/market/domian/Configuration.java +++ /dev/null @@ -1,44 +0,0 @@ -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 org.springframework.beans.BeanUtils; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -/** - * @Author：ChenYan - * @Description 接口配置 - * @Date：2024/8/20 11:17 - */ -public class Configuration extends BaseEntity { - - @TableId(value = "config_id" ,type = IdType.AUTO) - private Long configId ; - /** 接口名称 */ - private String configName ; - /** 接口描述 */ - private String configDescribe ; - /** 接口规则 */ - private Long configRuleId ; - /** 主接口 */ - private String configMain ; - /** 从接口 */ - private String configSlave ; - /** 辅接口 */ - private String configAuxiliary ; - /** 应急联系组 */ - private String configTeam ; - /** 状态 */ - private Integer state ; -} 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/Interface.java b/cloud-market-common/src/main/java/com/muyu/market/domian/Interface.java deleted file mode 100644 index 1f61a76..0000000 --- a/cloud-market-common/src/main/java/com/muyu/market/domian/Interface.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.muyu.market.domian; - - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@TableName(value = "interface", autoResultMap = true) -public class Interface { - - @TableId(value = "interface_id" ,type = IdType.AUTO) - private Integer interfaceId ; - /** 接口编码 */ - private String interfaceNumber ; - /** 调用次数 */ - private Integer interfaceNum ; - /** 启用状态 */ - private Integer interfaceStatus ; -} diff --git a/cloud-market-common/src/main/java/com/muyu/market/domian/InterfaceType.java b/cloud-market-common/src/main/java/com/muyu/market/domian/InterfaceType.java deleted file mode 100644 index 49a6ef7..0000000 --- a/cloud-market-common/src/main/java/com/muyu/market/domian/InterfaceType.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.muyu.market.domian; - - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@TableName(value = "interfaceType", autoResultMap = true) -public class InterfaceType { - - @TableId(value = "type_id" ,type = IdType.AUTO) - private Integer typeId ; - /** 类型编码 */ - private String typeNumber ; - /** 类型名称 */ - private String typeDescribe ; - /** 启用状态 */ - private Integer typeStatus ; -} diff --git a/cloud-market-common/src/main/java/com/muyu/market/domian/Item.java b/cloud-market-common/src/main/java/com/muyu/market/domian/Item.java deleted file mode 100644 index 3875553..0000000 --- a/cloud-market-common/src/main/java/com/muyu/market/domian/Item.java +++ /dev/null @@ -1,37 +0,0 @@ -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; -/** - * @Author：ChenYan - * @Description 项目统计 - * @Date：2024/8/20 11:17 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@TableName(value = "item", autoResultMap = true) -public class Item extends BaseEntity { - - @TableId(value = "item_id" ,type = IdType.AUTO) - private Long itemId ; - /** 项目名称 */ - private String itemName ; - /** 接口使用配置数 */ - private Integer itemAllocationNum ; - /** 接口调用失败（主） */ - private Integer itemFailedMain ; - /** 接口调用成功（主） */ - private Integer itemSuccessMain ; - /** 接口调用成功（总） */ - private Integer itemSuccess ; -} diff --git a/cloud-market-common/src/main/java/com/muyu/market/domian/Log.java b/cloud-market-common/src/main/java/com/muyu/market/domian/Log.java deleted file mode 100644 index 075d276..0000000 --- a/cloud-market-common/src/main/java/com/muyu/market/domian/Log.java +++ /dev/null @@ -1,54 +0,0 @@ -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.fasterxml.jackson.annotation.JsonFormat; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@TableName(value = "log", autoResultMap = true) -public class Log { - - @TableId(value = "log_id" ,type = IdType.AUTO) - private Long logId; - /** 登录人ID */ - private Integer userId ; - /** 操作人ID */ - private Integer staffId ; - /** 登录时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date logTime ; - /** 登录IP */ - private String logIp ; - /** 登录城市 */ - private String logAddress ; - /** 状态 */ - private Integer logStatus ; - /** 租户号 */ - private String tenantId ; - /** 乐观锁 */ - private Integer revision ; - /** 创建人 */ - private String createdBy ; - /** 创建时间 */ - private Date createdTime ; - /** 更新人 */ - private String updatedBy ; - /** 更新时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updatedTime ; -} 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/Operate.java b/cloud-market-common/src/main/java/com/muyu/market/domian/Operate.java deleted file mode 100644 index a9b3438..0000000 --- a/cloud-market-common/src/main/java/com/muyu/market/domian/Operate.java +++ /dev/null @@ -1,42 +0,0 @@ -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.fasterxml.jackson.annotation.JsonFormat; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@TableName(value = "operate", autoResultMap = true) -public class Operate { - - @TableId(value = "operate_id" ,type = IdType.AUTO) - private Long operateId ; - /** 登录人ID */ - private Integer userId ; - /** 操作人ID */ - private Integer staffId ; - /** 操作日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date operateTime ; - /** 操作内容 */ - private String operateContent ; - /** 状态 */ - private Integer operateStatus ; - /** 租户号 */ - private String tenantId ; - -} 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/Staff.java b/cloud-market-common/src/main/java/com/muyu/market/domian/Staff.java deleted file mode 100644 index e6fa469..0000000 --- a/cloud-market-common/src/main/java/com/muyu/market/domian/Staff.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.muyu.market.domian; - - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@TableName(value = "staff", autoResultMap = true) -public class Staff { - - @TableId(value = "staff_id" ,type = IdType.AUTO) - private String staffId ; - /** 员工姓名 */ - private String staffName ; - /** 员工电话 */ - private String staffTel ; - /** 员工密码 */ - private String staffPwd ; - /** 所属部门 */ - private String deptId ; - /** 状态 */ - private String staffStatus ; - /** 租户号 */ - private String tenantId ; -} 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-common/src/main/java/com/muyu/market/domian/User.java b/cloud-market-common/src/main/java/com/muyu/market/domian/User.java deleted file mode 100644 index afadb9d..0000000 --- a/cloud-market-common/src/main/java/com/muyu/market/domian/User.java +++ /dev/null @@ -1,44 +0,0 @@ -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.fasterxml.jackson.annotation.JsonFormat; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@TableName(value = "user", autoResultMap = true) -public class User { - - @TableId(value = "user_id" ,type = IdType.AUTO) - private Long userId ; - /** 用户编码 */ - private String userNumber ; - /** 用户名称 */ - private String userName ; - /** 会员类型 */ - private Integer vipId ; - /** 用户电话 */ - private String userTel ; - /** 用户地址 */ - private String userAddress ; - /** 用户密码 */ - private String userPwd ; - /** 注册时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date userTime ; - /** 是否在线 */ - private Integer userStatus ; -} diff --git a/cloud-market-common/src/main/java/com/muyu/market/domian/Vip.java b/cloud-market-common/src/main/java/com/muyu/market/domian/Vip.java deleted file mode 100644 index 920a6cd..0000000 --- a/cloud-market-common/src/main/java/com/muyu/market/domian/Vip.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.muyu.market.domian; - - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = false) -@TableName(value = "vip", autoResultMap = true) -public class Vip { - - @TableId(value = "vip_id" ,type = IdType.AUTO) - private Integer vipId ; - /** 会员编码 */ - private String vipNumber ; - /** 会员名称 */ - private String vipName ; - /** 启用状态 */ - private Integer vipStatus ; - -} 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 704cff3..3e704ef 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 @@ -28,49 +28,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(); - } - }