qizu
/
2112-cloud-market
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/sy' into cy

sy
86173 2024-08-22 20:57:28 +08:00
parent a0ed030304 11f819e4ba
commit 448c3997eb
10 changed files with 256 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.idea/encodings.xml 100644
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/java" charset="UTF-8" />
<file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-market-client/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-market-client/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-market-common/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-market-common/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-market-remote/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-market-remote/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-market-server/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/cloud-market-server/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component>
</project>

44
cloud-market-common/src/main/java/com/muyu/market/domian/Connertor.java 100644
View File

@ -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;
}

53
cloud-market-common/src/main/java/com/muyu/market/domian/Defined.java
View File

@ -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;
}
}

43
cloud-market-common/src/main/java/com/muyu/market/domian/Logs.java 100644
View File

@ -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;
}

45
cloud-market-common/src/main/java/com/muyu/market/domian/Pay.java 100644
View File

@ -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;
}

4
cloud-market-common/src/main/java/com/muyu/market/domian/Rule.java
View File

@ -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 ;

30
cloud-market-common/src/main/java/com/muyu/market/domian/Type.java
View File

@ -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 String typeDescription;
/**
* 使用数量
*/
private Integer typeNum;
/** 调用次数 */
/**
* 调用次数
*/
private Integer typeNumber;
// private String createBy;
// private String createTime;
// private String updateBy;
// private String updateTime;
}

85
cloud-market-server/src/main/java/com/muyu/master/controller/DefinedController.java
View File

@ -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<List<Defined>> selectList(
@Validated @RequestBody Defined defined) {
return Result.success(
definedService.selectList(defined)
);
}
/**
* 接口添加
*/
@PostMapping
@Operation(summary = "添加", description = "根据接口实体类添加，添加成功之后才可以使用支付类产品")
public Result<String> save(@Validated @RequestBody Defined defined) {
definedService.save(defined);
return Result.success();
}
/**
* 接口修改
*/
@PutMapping("/{definedId}")
@Operation(summary = "修改", description = "通过ID修改信息")
public Result<String> 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<List<Defined>> selectList(
// @Validated @RequestBody Defined defined) {
// return Result.success(
// definedService.selectList(defined)
// );
// }
//
//
// /**
// * 接口添加
// */
// @PostMapping
// @Operation(summary = "添加", description = "根据接口实体类添加，添加成功之后才可以使用支付类产品")
// public Result<String> save(@Validated @RequestBody Defined defined) {
// definedService.save(defined);
// return Result.success();
// }
//
//
// /**
// * 接口修改
// */
// @PutMapping("/{definedId}")
// @Operation(summary = "修改", description = "通过ID修改信息")
// public Result<String> updateById(
// @Validated @RequestBody Defined defined,
// @Schema(title = "ID", defaultValue = "1", type = "Long", description = "修改信息所需的唯一条件")
// @PathVariable("definedId") Long definedId) {
//
// definedService.updateById(defined);
// return Result.success();
// }
}

1
cloud-market-server/src/main/java/com/muyu/master/service/DefinedService.java
View File

@ -13,6 +13,5 @@ import java.util.List;
* @Date：2024/8/20 14:48
*/
public interface DefinedService extends IService<Defined> {
List<Defined> selectList(Defined defined);
}

15
cloud-market-server/src/main/java/com/muyu/master/service/impl/DefinedServiceImpl.java
View File

@ -30,20 +30,5 @@ public class DefinedServiceImpl
private DefinedMapper definedMapper;
@Override
public List<Defined> selectList(Defined defined) {
LambdaQueryWrapper<Defined> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.like(
StringUtils.isNotEmpty(defined.getDefinedName()),
defined::getDefinedName, defined.getDefinedName()
);
return this.list(queryWrapper)
.stream()
.toList();
}
}