WFC/be.wfc
2
0
Fork 0
Code Activity

fix: migrate package

Browse Source
This commit is contained in:
caiyuchao
2024-12-20 11:13:54 +08:00
parent a54834473d
commit aaeb672b5d
21 changed files with 202 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
sql/wfc_system_db/wfc_system_db.sql
View File

@@ -705,46 +705,5 @@ CREATE TABLE `sys_user_role` (
INSERT INTO `sys_user_role` VALUES (1, 1);
INSERT INTO `sys_user_role` VALUES (2, 2);
DROP TABLE IF EXISTS `sys_package`;
CREATE TABLE `sys_package` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`rate_limit_id` bigint(20) DEFAULT NULL COMMENT '带宽限速ID',
`package_name` varchar(64) DEFAULT NULL COMMENT '套餐名称',
`period_num` int(11) DEFAULT NULL COMMENT '有效期数',
`period_type` varchar(32) DEFAULT NULL COMMENT '有效期类型',
`price` decimal(18,4) DEFAULT NULL COMMENT '价格',
`traffic` bigint(20) DEFAULT NULL COMMENT '流量',
`duration` bigint(20) DEFAULT NULL COMMENT '时长',
`client_num` int(11) DEFAULT NULL COMMENT '在线设备数',
`remark` varchar(500) DEFAULT NULL COMMENT '备注',
`rate_limit_enable` tinyint(1) DEFAULT '0' COMMENT '带宽是否限制',
`traffic_enable` tinyint(1) DEFAULT '0' COMMENT '流量是否限制',
`duration_enable` tinyint(1) DEFAULT '0' COMMENT '时长是否限制',
`client_num_enable` tinyint(1) DEFAULT '0' COMMENT '在线设备数是否限制',
`package_enable` tinyint(1) DEFAULT '0' COMMENT '套餐是否启用',
`del_flag` tinyint(1) DEFAULT '0' COMMENT '删除标志（0存在 1删除）',
`create_by` bigint(20) DEFAULT NULL COMMENT '创建人',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) DEFAULT NULL COMMENT '更新人',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1869677552538566658 DEFAULT CHARSET=utf8mb4 COMMENT='客户平台-套餐表';
DROP TABLE IF EXISTS `sys_rate_limit`;
CREATE TABLE `sys_rate_limit` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`rate_limit_name` varchar(32) DEFAULT NULL COMMENT '限速名称',
`down_limit` bigint(20) DEFAULT NULL COMMENT '下行限速',
`down_limit_enable` tinyint(1) DEFAULT '0' COMMENT '下行限速启用',
`up_limit` bigint(20) DEFAULT NULL COMMENT '上行限速',
`up_limit_enable` tinyint(1) DEFAULT '0' COMMENT '上行限速启用',
`del_flag` tinyint(1) DEFAULT '0' COMMENT '删除标志（0存在 1删除）',
`create_by` bigint(20) DEFAULT NULL COMMENT '创建人',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) DEFAULT NULL COMMENT '更新人',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='客户平台-带宽限速表';
SET FOREIGN_KEY_CHECKS = 1;

41
sql/wfc_user_db/wfc_user_db.sql
View File

@@ -765,4 +765,45 @@ CREATE TABLE `u_user_role` (
-- ----------------------------
INSERT INTO `u_user_role` VALUES (1, 1);
DROP TABLE IF EXISTS `u_package`;
CREATE TABLE `u_package` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`rate_limit_id` bigint(20) DEFAULT NULL COMMENT '带宽限速ID',
`package_name` varchar(64) DEFAULT NULL COMMENT '套餐名称',
`period_num` int(11) DEFAULT NULL COMMENT '有效期数',
`period_type` varchar(32) DEFAULT NULL COMMENT '有效期类型',
`price` decimal(18,4) DEFAULT NULL COMMENT '价格',
`traffic` bigint(20) DEFAULT NULL COMMENT '流量',
`duration` bigint(20) DEFAULT NULL COMMENT '时长',
`client_num` int(11) DEFAULT NULL COMMENT '在线设备数',
`remark` varchar(500) DEFAULT NULL COMMENT '备注',
`rate_limit_enable` tinyint(1) DEFAULT '0' COMMENT '带宽是否限制',
`traffic_enable` tinyint(1) DEFAULT '0' COMMENT '流量是否限制',
`duration_enable` tinyint(1) DEFAULT '0' COMMENT '时长是否限制',
`client_num_enable` tinyint(1) DEFAULT '0' COMMENT '在线设备数是否限制',
`package_enable` tinyint(1) DEFAULT '0' COMMENT '套餐是否启用',
`del_flag` tinyint(1) DEFAULT '0' COMMENT '删除标志（0存在 1删除）',
`create_by` bigint(20) DEFAULT NULL COMMENT '创建人',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) DEFAULT NULL COMMENT '更新人',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户平台-套餐表';
DROP TABLE IF EXISTS `u_rate_limit`;
CREATE TABLE `u_rate_limit` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`rate_limit_name` varchar(32) DEFAULT NULL COMMENT '限速名称',
`down_limit` bigint(20) DEFAULT NULL COMMENT '下行限速',
`down_limit_enable` tinyint(1) DEFAULT '0' COMMENT '下行限速启用',
`up_limit` bigint(20) DEFAULT NULL COMMENT '上行限速',
`up_limit_enable` tinyint(1) DEFAULT '0' COMMENT '上行限速启用',
`del_flag` tinyint(1) DEFAULT '0' COMMENT '删除标志（0存在 1删除）',
`create_by` bigint(20) DEFAULT NULL COMMENT '创建人',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` bigint(20) DEFAULT NULL COMMENT '更新人',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户平台-带宽限速表';
SET FOREIGN_KEY_CHECKS = 1;

34
wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysRateLimitController.java → wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/UPackageController.java
View File

@@ -13,57 +13,57 @@ import org.springframework.web.bind.annotation.RestController;
import org.wfc.common.core.web.controller.BaseController;
import org.wfc.common.core.web.domain.AjaxResult;
import org.wfc.common.core.web.page.TableDataInfo;
import org.wfc.system.domain.SysRateLimit;
import org.wfc.system.service.ISysRateLimitService;
import org.wfc.system.domain.UPackage;
import org.wfc.system.service.IUPackageService;
import java.util.List;
/**
* <p>
* 客户平台-带宽限速表 前端控制器
* 用户平台-套餐表 前端控制器
* </p>
*
* @author sys
* @since 2024-12-19
* @since 2024-12-20
*/
@RestController
@RequestMapping("/system/sysRateLimit")
public class SysRateLimitController extends BaseController {
@RequestMapping("/package")
public class UPackageController extends BaseController {
@Autowired
public ISysRateLimitService sysRateLimitService;
public IUPackageService uPackageService;
@GetMapping("/page")
public TableDataInfo page(SysRateLimit sysRateLimit) {
public TableDataInfo page(UPackage uPackage) {
startPage();
List<SysRateLimit> list = sysRateLimitService.list();
List<UPackage> list = uPackageService.list();
return getDataTable(list);
}
@GetMapping("/list")
public AjaxResult list(SysRateLimit sysRateLimit) {
List<SysRateLimit> list = sysRateLimitService.list();
public AjaxResult list(UPackage uPackage) {
List<UPackage> list = uPackageService.list();
return success(list);
}
@GetMapping(value = "/{id}")
public AjaxResult getById(@PathVariable("id") Long id) {
return success(sysRateLimitService.getById(id));
return success(uPackageService.getById(id));
}
@PostMapping
public AjaxResult add(@RequestBody SysRateLimit sysRateLimit) {
return toAjax(sysRateLimitService.save(sysRateLimit));
public AjaxResult add(@RequestBody UPackage uPackage) {
return toAjax(uPackageService.save(uPackage));
}
@PutMapping
public AjaxResult edit(@RequestBody SysRateLimit sysRateLimit) {
return toAjax(sysRateLimitService.updateById(sysRateLimit));
public AjaxResult edit(@RequestBody UPackage uPackage) {
return toAjax(uPackageService.updateById(uPackage));
}
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(sysRateLimitService.removeByIds(CollUtil.newArrayList(ids)));
return toAjax(uPackageService.removeByIds(CollUtil.newArrayList(ids)));
}
}

34
wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysPackageController.java → wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/URateLimitController.java
View File

@@ -13,57 +13,57 @@ import org.springframework.web.bind.annotation.RestController;
import org.wfc.common.core.web.controller.BaseController;
import org.wfc.common.core.web.domain.AjaxResult;
import org.wfc.common.core.web.page.TableDataInfo;
import org.wfc.system.domain.SysPackage;
import org.wfc.system.service.ISysPackageService;
import org.wfc.system.domain.URateLimit;
import org.wfc.system.service.IURateLimitService;
import java.util.List;
/**
* <p>
* 客户平台-套餐表 前端控制器
* 用户平台-带宽限速表 前端控制器
* </p>
*
* @author sys
* @since 2024-12-19
* @since 2024-12-20
*/
@RestController
@RequestMapping("/system/sysPackage")
public class SysPackageController extends BaseController {
@RequestMapping("/rateLimit")
public class URateLimitController extends BaseController {
@Autowired
public ISysPackageService sysPackageService;
public IURateLimitService uRateLimitService;
@GetMapping("/page")
public TableDataInfo page(SysPackage sysPackage) {
public TableDataInfo page(URateLimit uRateLimit) {
startPage();
List<SysPackage> list = sysPackageService.list();
List<URateLimit> list = uRateLimitService.list();
return getDataTable(list);
}
@GetMapping("/list")
public AjaxResult list(SysPackage sysPackage) {
List<SysPackage> list = sysPackageService.list();
public AjaxResult list(URateLimit uRateLimit) {
List<URateLimit> list = uRateLimitService.list();
return success(list);
}
@GetMapping(value = "/{id}")
public AjaxResult getById(@PathVariable("id") Long id) {
return success(sysPackageService.getById(id));
return success(uRateLimitService.getById(id));
}
@PostMapping
public AjaxResult add(@RequestBody SysPackage sysPackage) {
return toAjax(sysPackageService.save(sysPackage));
public AjaxResult add(@RequestBody URateLimit uRateLimit) {
return toAjax(uRateLimitService.save(uRateLimit));
}
@PutMapping
public AjaxResult edit(@RequestBody SysPackage sysPackage) {
return toAjax(sysPackageService.updateById(sysPackage));
public AjaxResult edit(@RequestBody URateLimit uRateLimit) {
return toAjax(uRateLimitService.updateById(uRateLimit));
}
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(sysPackageService.removeByIds(CollUtil.newArrayList(ids)));
return toAjax(uRateLimitService.removeByIds(CollUtil.newArrayList(ids)));
}
}

12
wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysPackage.java → wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/UPackage.java
View File

@@ -10,17 +10,17 @@ import lombok.Setter;
/**
* <p>
* 客户平台-套餐表
* 用户平台-套餐表
* </p>
*
* @author cyc
* @since 2024-12-19
* @author sys
* @since 2024-12-20
*/
@Getter
@Setter
@TableName("sys_package")
@Schema(name = "SysPackage", description = "客户平台-套餐表")
public class SysPackage extends BaseData {
@TableName("u_package")
@Schema(name = "UPackage", description = "用户平台-套餐表")
public class UPackage extends BaseData {
private static final long serialVersionUID = 1L;

12
wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/SysRateLimit.java → wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/URateLimit.java
View File

@@ -9,17 +9,17 @@ import lombok.Setter;
/**
* <p>
* 客户平台-带宽限速表
* 用户平台-带宽限速表
* </p>
*
* @author cyc
* @since 2024-12-19
* @author sys
* @since 2024-12-20
*/
@Getter
@Setter
@TableName("sys_rate_limit")
@Schema(name = "SysRateLimit", description = "客户平台-带宽限速表")
public class SysRateLimit extends BaseData {
@TableName("u_rate_limit")
@Schema(name = "URateLimit", description = "用户平台-带宽限速表")
public class URateLimit extends BaseData {
private static final long serialVersionUID = 1L;

16
wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysPackageMapper.java
View File

@@ -1,16 +0,0 @@
package org.wfc.system.mapper;
import org.wfc.system.domain.SysPackage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 客户平台-套餐表 Mapper 接口
* </p>
*
* @author cyc
* @since 2024-12-19
*/
public interface SysPackageMapper extends BaseMapper<SysPackage> {
}

16
wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/SysRateLimitMapper.java
View File

@@ -1,16 +0,0 @@
package org.wfc.system.mapper;
import org.wfc.system.domain.SysRateLimit;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 客户平台-带宽限速表 Mapper 接口
* </p>
*
* @author cyc
* @since 2024-12-19
*/
public interface SysRateLimitMapper extends BaseMapper<SysRateLimit> {
}

18
wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/UPackageMapper.java Normal file
View File

@@ -0,0 +1,18 @@
package org.wfc.system.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.wfc.system.domain.UPackage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 用户平台-套餐表 Mapper 接口
* </p>
*
* @author sys
* @since 2024-12-20
*/
@DS("user")
public interface UPackageMapper extends BaseMapper<UPackage> {
}

18
wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/URateLimitMapper.java Normal file
View File

@@ -0,0 +1,18 @@
package org.wfc.system.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.wfc.system.domain.URateLimit;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 用户平台-带宽限速表 Mapper 接口
* </p>
*
* @author sys
* @since 2024-12-20
*/
@DS("user")
public interface URateLimitMapper extends BaseMapper<URateLimit> {
}

16
wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysPackageService.java
View File

@@ -1,16 +0,0 @@
package org.wfc.system.service;
import org.wfc.system.domain.SysPackage;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 客户平台-套餐表 服务类
* </p>
*
* @author cyc
* @since 2024-12-19
*/
public interface ISysPackageService extends IService<SysPackage> {
}

16
wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysRateLimitService.java
View File

@@ -1,16 +0,0 @@
package org.wfc.system.service;
import org.wfc.system.domain.SysRateLimit;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 客户平台-带宽限速表 服务类
* </p>
*
* @author cyc
* @since 2024-12-19
*/
public interface ISysRateLimitService extends IService<SysRateLimit> {
}

16
wfc-modules/wfc-system/src/main/java/org/wfc/system/service/IUPackageService.java Normal file
View File

@@ -0,0 +1,16 @@
package org.wfc.system.service;
import org.wfc.system.domain.UPackage;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 用户平台-套餐表 服务类
* </p>
*
* @author sys
* @since 2024-12-20
*/
public interface IUPackageService extends IService<UPackage> {
}

16
wfc-modules/wfc-system/src/main/java/org/wfc/system/service/IURateLimitService.java Normal file
View File

@@ -0,0 +1,16 @@
package org.wfc.system.service;
import org.wfc.system.domain.URateLimit;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 用户平台-带宽限速表 服务类
* </p>
*
* @author sys
* @since 2024-12-20
*/
public interface IURateLimitService extends IService<URateLimit> {
}

20
wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysPackageServiceImpl.java
View File

@@ -1,20 +0,0 @@
package org.wfc.system.service.impl;
import org.wfc.system.domain.SysPackage;
import org.wfc.system.mapper.SysPackageMapper;
import org.wfc.system.service.ISysPackageService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 客户平台-套餐表 服务实现类
* </p>
*
* @author cyc
* @since 2024-12-19
*/
@Service
public class SysPackageServiceImpl extends ServiceImpl<SysPackageMapper, SysPackage> implements ISysPackageService {
}

20
wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysRateLimitServiceImpl.java
View File

@@ -1,20 +0,0 @@
package org.wfc.system.service.impl;
import org.wfc.system.domain.SysRateLimit;
import org.wfc.system.mapper.SysRateLimitMapper;
import org.wfc.system.service.ISysRateLimitService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 客户平台-带宽限速表 服务实现类
* </p>
*
* @author cyc
* @since 2024-12-19
*/
@Service
public class SysRateLimitServiceImpl extends ServiceImpl<SysRateLimitMapper, SysRateLimit> implements ISysRateLimitService {
}

20
wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/UPackageServiceImpl.java Normal file
View File

@@ -0,0 +1,20 @@
package org.wfc.system.service.impl;
import org.wfc.system.domain.UPackage;
import org.wfc.system.mapper.UPackageMapper;
import org.wfc.system.service.IUPackageService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 用户平台-套餐表 服务实现类
* </p>
*
* @author sys
* @since 2024-12-20
*/
@Service
public class UPackageServiceImpl extends ServiceImpl<UPackageMapper, UPackage> implements IUPackageService {
}

20
wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/URateLimitServiceImpl.java Normal file
View File

@@ -0,0 +1,20 @@
package org.wfc.system.service.impl;
import org.wfc.system.domain.URateLimit;
import org.wfc.system.mapper.URateLimitMapper;
import org.wfc.system.service.IURateLimitService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 用户平台-带宽限速表 服务实现类
* </p>
*
* @author sys
* @since 2024-12-20
*/
@Service
public class URateLimitServiceImpl extends ServiceImpl<URateLimitMapper, URateLimit> implements IURateLimitService {
}

5
wfc-modules/wfc-system/src/main/resources/application.yml
View File

@@ -35,6 +35,11 @@ spring:
url: jdbc:mysql://wfc-mysql:3306/wfc_system_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
user:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://wfc-mysql:3306/wfc_user_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
# 从库数据源
# slave:
# username:

2
wfc-modules/wfc-system/src/main/resources/mapper/system/SysPackageMapper.xml → wfc-modules/wfc-system/src/main/resources/mapper/system/UPackageMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.wfc.system.mapper.SysPackageMapper">
<mapper namespace="org.wfc.system.mapper.UPackageMapper">
</mapper>

2
wfc-modules/wfc-system/src/main/resources/mapper/system/SysRateLimitMapper.xml → wfc-modules/wfc-system/src/main/resources/mapper/system/URateLimitMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.wfc.system.mapper.SysRateLimitMapper">
<mapper namespace="org.wfc.system.mapper.URateLimitMapper">
</mapper>