From cea434aed3e79abf8c33d1a6e9811bc38380fb55 Mon Sep 17 00:00:00 2001 From: 86173 <3139166962@qq.com> Date: Thu, 22 Aug 2024 19:47:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4c00db4a90e9d?= 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/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/Operate.java | 42 --------------- .../java/com/muyu/market/domian/Staff.java | 35 ------------ .../java/com/muyu/market/domian/User.java | 44 --------------- .../main/java/com/muyu/market/domian/Vip.java | 30 ----------- 10 files changed, 388 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 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 delete mode 100644 cloud-market-common/src/main/java/com/muyu/market/domian/Operate.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/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/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/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/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 ; - -} From 93072f5f9d2b9287a34d9339b78e2a9dbbfaf82b Mon Sep 17 00:00:00 2001 From: 86173 <3139166962@qq.com> Date: Thu, 22 Aug 2024 20:25:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4c00db4a90e9d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/muyu/master/controller/DefinedController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..fa9ad07 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 @@ -24,7 +24,7 @@ import java.util.List; @Log4j2 @RestController -@RequestMapping("/defined") +//@RequestMapping("/defined") @Tag(name = "定义接口控制层",description = "进行客户管理，查看等相关操作") public class DefinedController { From 0da9d5ea5b1df6ae79911d5e12df9333d98205e2 Mon Sep 17 00:00:00 2001 From: 86173 <3139166962@qq.com> Date: Thu, 22 Aug 2024 20:28:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4c00db4a90e9d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/muyu/master/controller/DefinedController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fa9ad07..0083a45 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 @@ -24,7 +24,7 @@ import java.util.List; @Log4j2 @RestController -//@RequestMapping("/defined") +@RequestMapping("/master") @Tag(name = "定义接口控制层",description = "进行客户管理，查看等相关操作") public class DefinedController {