From 6b96492c540e24cc29d55573c5816df808279825 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 10 七月 2024 16:10:17 +0800
Subject: [PATCH] 分表
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/RuoYiStudyApplication.java | 8
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DatasourceModel.java | 24 +
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java | 34 ++
ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml | 6
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/Master0DataSource.java | 2
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java | 34 +-
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java | 9
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TOrderController.java | 13
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITVipSetService.java | 2
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java | 24 +
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TGoodsController.java | 11
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/model/TSubjectRecord.java | 4
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserPresentRecord.java | 4
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TVipSetServiceImpl.java | 49 +++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecord.java | 4
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/RuoYiGoodsApplication.java | 8
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 50 +++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java | 10
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/FeedbackVO.java | 4
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserStudyRecord.java | 4
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/Master0DataSource.java | 8
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStoryController.java | 18 -
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/ShardingConfig.java | 96 ++++++
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java | 10
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/ShardingConfig.java | 172 ++++++++++++
ruoyi-common/pom.xml | 2
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/model/TGameRecord.java | 4
/dev/null | 30 --
ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TFeedbackMapper.xml | 10
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 16 +
ruoyi-service/ruoyi-goods/pom.xml | 7
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 66 ++++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 29 +
ruoyi-common/ruoyi-common-datasource/pom.xml | 1
ruoyi-service/ruoyi-study/pom.xml | 6
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java | 4
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGameRecord.java | 4
37 files changed, 644 insertions(+), 143 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/model/TGameRecord.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/model/TGameRecord.java
index d5557d9..082a6c0 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/model/TGameRecord.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/model/TGameRecord.java
@@ -25,8 +25,8 @@
/**
* 主键id
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
/**
* 用户id
*/
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/model/TSubjectRecord.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/model/TSubjectRecord.java
index 03d9bd2..1bd2f81 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/model/TSubjectRecord.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/model/TSubjectRecord.java
@@ -24,8 +24,8 @@
/**
* 主键id
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
/**
* 用户id
*/
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
index c8d9ea0..f06a810 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java
@@ -16,6 +16,11 @@
return new SysUserClient(){
@Override
+ public R<SysUser> updatePassword1(SysUser sysUser) {
+ return null;
+ }
+
+ @Override
public R<List<CompanyUserListVo>> getSysUserFromCompanyId(CompanySysUserReq companySysUserReq) {
return R.fail("公司获取关联已有账号失败:" + cause.getMessage());
}
@@ -25,6 +30,10 @@
return R.fail("获取用户失败:" + cause.getMessage());
}
+ @Override
+ public R<SysUser> getSysUserByPhonenumber(String phonenumber) {
+ return null;
+ }
@Override
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
index 5c94321..f6daa54 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -1,11 +1,13 @@
package com.ruoyi.system.api.feignClient;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.factory.SysUserFallbackFactory;
import com.ruoyi.system.api.model.*;
+import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -16,12 +18,18 @@
@FeignClient(contextId = "sysUserClient", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = SysUserFallbackFactory.class)
public interface SysUserClient {
-
+ @PostMapping("/user/updatePassword1")
+ @ApiOperation("账号管理--账号详情")
+ R<SysUser> updatePassword1(@RequestBody SysUser sysUser);
@PostMapping("/user/getSysUserFromCompanyId")
R<List<CompanyUserListVo>> getSysUserFromCompanyId(@RequestBody CompanySysUserReq companySysUserReq);
@PostMapping("/user/getSysUser")
R<SysUser> getSysUser(Long userId);
+ @PostMapping("/user/getSysUserByPhonenumber/{phonenumber}")
+ R<SysUser> getSysUserByPhonenumber(@PathVariable("phonenumber") String phonenumber);
+
+
// @PostMapping("/user/updateSysUser")
// R<Boolean> updateSysUser(@RequestBody SysUser sysUser);
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 2d5d03a..c5fd1af 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -27,6 +27,8 @@
</description>
<dependencies>
+
+
<!--lombok-->
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml
index 69a35f3..d41b693 100644
--- a/ruoyi-common/ruoyi-common-datasource/pom.xml
+++ b/ruoyi-common/ruoyi-common-datasource/pom.xml
@@ -31,5 +31,6 @@
<version>${dynamic-ds.version}</version>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index c22b791..4cf46fb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -49,6 +49,22 @@
@Autowired
private ISysPermissionService permissionService;
/**
+ * 删除用户
+ */
+ @PostMapping("/getSysUserByPhonenumber/{phonenumber}")
+ @ApiOperation("根据手机号获取账号")
+ public R<SysUser> getSysUserByPhonenumber(@PathVariable("phonenumber") String phonenumber) {
+ SysUser one = userService.getOne(new QueryWrapper<SysUser>()
+ .eq("phonenumber", phonenumber).eq("del_flag", 0));
+ return R.ok(one);
+ }
+ @PostMapping("/updatePassword1")
+ @ApiOperation("账号管理--账号详情")
+ public R<SysUser> updatePassword1(@RequestBody SysUser sysUser) {
+ userService.updateUser(sysUser);
+ return R.ok(sysUser);
+ }
+ /**
* 获取当前用户信息
*/
@InnerAuth
diff --git a/ruoyi-service/ruoyi-goods/pom.xml b/ruoyi-service/ruoyi-goods/pom.xml
index a770520..21ce193 100644
--- a/ruoyi-service/ruoyi-goods/pom.xml
+++ b/ruoyi-service/ruoyi-goods/pom.xml
@@ -15,7 +15,12 @@
</description>
<dependencies>
-
+ <!--依赖sharding-jdbc-->
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-jdbc-core</artifactId>
+ <version>5.2.0</version>
+ </dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/RuoYiGoodsApplication.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/RuoYiGoodsApplication.java
index 4d3dde1..0bd8d84 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/RuoYiGoodsApplication.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/RuoYiGoodsApplication.java
@@ -6,6 +6,8 @@
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.scheduling.annotation.EnableScheduling;
/**
@@ -35,4 +37,10 @@
" | | \\ / \\ / \n" +
" ''-' `'-' `-..-' ");
}
+ @Bean
+ public static PropertySourcesPlaceholderConfigurer placeholderConfigurer() {
+ PropertySourcesPlaceholderConfigurer c = new PropertySourcesPlaceholderConfigurer();
+ c.setIgnoreUnresolvablePlaceholders(true);
+ return c;
+ }
}
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DatasourceModel.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DatasourceModel.java
new file mode 100644
index 0000000..02c5a40
--- /dev/null
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/DatasourceModel.java
@@ -0,0 +1,24 @@
+package com.ruoyi.goods.config;
+
+
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
+/**
+ * 数据源
+ *
+ * @author pzb
+ * @Date 2022/11/21 21:13
+ */
+@Data
+@Component
+public class DatasourceModel {
+ private String url = "jdbc:mysql://127.0.0.1:10633/dolphin_goods?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai";
+ private String username = "root";
+ private String password = "HaiTunEnglish2024!";
+ private String driverClassName = "com.mysql.cj.jdbc.Driver";
+ private Integer maxActive =20;
+ private Long maxWait = 60000L;
+ private Integer minIdle =5;
+ private Integer initialSize =2;
+}
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/Master0DataSource.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/Master0DataSource.java
new file mode 100644
index 0000000..5033eae
--- /dev/null
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/Master0DataSource.java
@@ -0,0 +1,2 @@
+package com.ruoyi.goods.config;
+
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/ShardingConfig.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/ShardingConfig.java
new file mode 100644
index 0000000..12cbf99
--- /dev/null
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/ShardingConfig.java
@@ -0,0 +1,96 @@
+package com.ruoyi.goods.config;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import org.apache.shardingsphere.driver.api.ShardingSphereDataSourceFactory;
+import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
+import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.sql.DataSource;
+import java.sql.SQLException;
+import java.util.*;
+
+@Configuration
+public class ShardingConfig {
+
+ @Autowired
+ private DatasourceModel master0DataSource;
+
+
+ @Bean
+ public DataSource getDataSource() {
+ DataSource dataSource = null;
+ try {
+ Properties properties = new Properties();
+ properties.setProperty("sql-show", "true");
+ String databaseName = "m_0";//真实数据源名称，多个数据源用逗号区分
+ dataSource = ShardingSphereDataSourceFactory.createDataSource(databaseName, createDataSourceMap(), createShardingRuleConfiguration(), properties);
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ return dataSource;
+ }
+
+
+ /**
+ * 配置多数据源
+ *
+ * @return
+ */
+ private Map<String, DataSource> createDataSourceMap() {
+ Map<String, DataSource> dataSourceMap = new HashMap<>();
+ // 配置第 1 个数据源
+ DruidDataSource dataSource1 = new DruidDataSource();
+ dataSource1.setDriverClassName(master0DataSource.getDriverClassName());
+ dataSource1.setUrl(master0DataSource.getUrl());
+ dataSource1.setUsername(master0DataSource.getUsername());
+ dataSource1.setPassword(master0DataSource.getPassword());
+ dataSource1.setMaxActive(master0DataSource.getMaxActive());
+ dataSource1.setMaxWait(master0DataSource.getMaxWait());
+ dataSource1.setMinIdle(master0DataSource.getMinIdle());
+ dataSource1.setInitialSize(master0DataSource.getInitialSize());
+ dataSourceMap.put("m_0", dataSource1);
+ return dataSourceMap;
+ }
+
+ /**
+ * 分片配置
+ *
+ * @return
+ */
+ private Collection<RuleConfiguration> createShardingRuleConfiguration() {
+ LinkedList<RuleConfiguration> linkedList = new LinkedList();
+
+ //分片规则配置
+ ShardingRuleConfiguration result1 = new ShardingRuleConfiguration();
+
+ result1.getTables().add(getCoursePackagePaymentTableRuleConfiguration());
+ Properties props1 = new Properties();
+ props1.setProperty("algorithm-expression", "t_order$->{userId % 5 + 1}");
+ result1.getShardingAlgorithms().put("t_order-inline", new AlgorithmConfiguration("INLINE", props1));
+ result1.getKeyGenerators().put("t_order-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
+
+ linkedList.add(result1);
+ return linkedList;
+ }
+
+ /**
+ * 分片算法配置
+ *
+ * @return
+ */
+ private ShardingTableRuleConfiguration getCoursePackagePaymentTableRuleConfiguration() {
+ ShardingTableRuleConfiguration result = new ShardingTableRuleConfiguration("t_order", "m_$->{0}.t_order$->{1..5}");//50
+ result.setTableShardingStrategy(new StandardShardingStrategyConfiguration("userId", "t_order-inline"));
+ result.setKeyGenerateStrategy(new KeyGenerateStrategyConfiguration("id", "t_order-snowflake"));
+ return result;
+ }
+
+
+}
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
index 796b60c..0913107 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
@@ -1,4 +1,5 @@
package com.ruoyi.goods.controller;
+import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -17,6 +18,7 @@
import com.ruoyi.goods.vo.TOrderVO;
import com.ruoyi.study.api.domain.TUser;
import com.ruoyi.study.api.feignClient.StudyClient;
+import com.ruoyi.study.api.vo.UserPersonalCenterVO;
import com.ruoyi.system.api.model.LoginUserParent;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -58,7 +60,38 @@
private IRegionService regionService;
@Resource
private TokenService tokenService;
-
+ @PostMapping("/testAddData")
+ @ApiOperation(value = "测试分片", tags = {"测试分片"})
+ public R<Object> testAddData() {
+ TOrder tOrder = new TOrder();
+ tOrder.setOrderNumber("");
+ tOrder.setUserId(63);
+ tOrder.setInsertTime(new Date());
+ tOrder.setGoodsId(0);
+ tOrder.setCount(0);
+ tOrder.setState(0);
+ tOrder.setExpress("");
+ tOrder.setExpressNumber("");
+ tOrder.setExpressTime(new Date());
+ tOrder.setIntegral(0);
+ tOrder.setCompleteTime(new Date());
+ tOrder.setConsigneeName("");
+ tOrder.setImg("");
+ tOrder.setName("");
+ tOrder.setType("");
+ tOrder.setConsigneePhone("");
+ tOrder.setConsigneeAddress("");
+ tOrder.setProvince("");
+ tOrder.setCity("");
+ tOrder.setRemark("");
+ tOrder.setDisabled(false);
+ tOrder.setCreateBy("");
+ tOrder.setCreateTime(new Date());
+ tOrder.setUpdateBy("");
+ tOrder.setUpdateTime(new Date());
+ orderService.save(tOrder);
+ return R.ok();
+ }
@PostMapping("/listType")
@ApiOperation(value = "列表查询", tags = {"后台-商品类型管理"})
public R<PageInfo<TGoodsType>> listType(@RequestBody GoodsTypeQuery query) {
@@ -662,7 +695,20 @@
if (null == loginUserStudy) {
return R.tokenError("登录失效！");
}
- return R.ok(goodsService.goodRecommend(loginUserStudy.getUserid()));
+ UserPersonalCenterVO data = studyClient.userInfo().getData();
+ List<TGoodsVO> tGoodsVOS = goodsService.goodRecommend(loginUserStudy.getUserid());
+ List<TGoodsVO> res = new ArrayList<>();
+ int temp = 0;
+ for (TGoodsVO re : tGoodsVOS) {
+ if (temp>=3){
+ break;
+ }
+ if (data.getUser().getIntegral()>=re.getIntegral()){
+ res.add(re);
+ temp++;
+ }
+ }
+ return R.ok(res);
}
/**
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java
index 19e9599..bbd5cab 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java
@@ -28,8 +28,8 @@
/**
* 主键id
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
/**
* 订单编号
*/
@@ -115,13 +115,7 @@
private String remark;
- public Integer getId() {
- return id;
- }
- public void setId(Integer id) {
- this.id = id;
- }
public String getOrderNumber() {
return orderNumber;
diff --git a/ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml b/ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml
index 74125a4..c4fbaad 100644
--- a/ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml
+++ b/ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml
@@ -49,9 +49,9 @@
<select id="goodRecommend" resultType="com.ruoyi.goods.vo.TGoodsVO">
select *
from t_goods g
- where g.integral <![CDATA[ <= ]]> (select integral from t_user u where u.id = #{userId})
- and g.disabled = 0
+
+ where g.disabled = 0
ORDER BY g.integral desc
- limit 3
+
</select>
</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysDeptController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysDeptController.java
deleted file mode 100644
index 73e0fcc..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysDeptController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.management.domain.SysDept;
-import com.ruoyi.management.dto.DeptQuery;
-import com.ruoyi.management.service.ISysDeptService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 部门表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/base/dept")
-public class SysDeptController {
- @Autowired
- private ISysDeptService deptService;
-
-
- @GetMapping(value = "/list")
- @ApiOperation(value = "列表", tags = {"后台-部门管理"})
- @ResponseBody
- public AjaxResult<PageInfo<SysDept>> getList(DeptQuery req) {
- PageInfo<SysDept> res = new PageInfo<>(req.getPageNumber(), req.getPageSize());
- List<SysDept> depts = deptService.getList(req);
- res.setRecords(depts);
- return AjaxResult.success(res);
- }
- @ApiOperation(value = "添加部门", tags = {"后台-部门管理"})
- @PostMapping(value = "/add")
- @ResponseBody
- public AjaxResult add(SysDept dept) {
- //完善pids,根据pid拿到pid的pids
- dept.setParentId(0L);
- deptSetPids(dept);
- dept.setCreateTime(new Date());
- dept.setDeptName(dept.getDeptName());
- deptService.save(dept);
- return AjaxResult.success("添加成功");
- }
- private void deptSetPids(SysDept dept) {
- if (dept.getParentId()== null || dept.getParentId() == 0L) {
- dept.setParentId(0L);
- dept.setAncestors("0");
- } else {
- long pid = dept.getParentId();
- SysDept temp = deptService.getById(pid);
- String pids = temp.getAncestors();
- dept.setParentId(pid);
- dept.setAncestors(pids + "" + pid + ",");
- }
- }
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysDictController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysDictController.java
deleted file mode 100644
index 664f00a..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysDictController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 字典表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysDict")
-public class SysDictController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysDictDataController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysDictDataController.java
deleted file mode 100644
index 5439c32..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysDictDataController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 字典数据表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysDictData")
-public class SysDictDataController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysDictTypeController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysDictTypeController.java
deleted file mode 100644
index 935f1df..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysDictTypeController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 字典类型表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysDictType")
-public class SysDictTypeController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysExpenseController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysExpenseController.java
deleted file mode 100644
index ae9c67c..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysExpenseController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 报销表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysExpense")
-public class SysExpenseController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysJobController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysJobController.java
deleted file mode 100644
index c5a78a5..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysJobController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 定时任务调度表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysJob")
-public class SysJobController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysJobLogController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysJobLogController.java
deleted file mode 100644
index 353b479..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysJobLogController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 定时任务调度日志表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysJobLog")
-public class SysJobLogController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysLoginLogController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysLoginLogController.java
deleted file mode 100644
index 6af15eb..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysLoginLogController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 登录记录 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysLoginLog")
-public class SysLoginLogController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysLogininforController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysLogininforController.java
deleted file mode 100644
index 177cf6a..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysLogininforController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 系统访问记录 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysLogininfor")
-public class SysLogininforController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysMenuController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysMenuController.java
deleted file mode 100644
index 062a419..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysMenuController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 菜单权限表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysMenu")
-public class SysMenuController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysNoticeController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysNoticeController.java
deleted file mode 100644
index 9541bd7..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysNoticeController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 通知公告表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysNotice")
-public class SysNoticeController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysOperationLogController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysOperationLogController.java
deleted file mode 100644
index 1e10684..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysOperationLogController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 操作日志 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysOperationLog")
-public class SysOperationLogController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysPostController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysPostController.java
deleted file mode 100644
index 7d4509c..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysPostController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 岗位信息表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysPost")
-public class SysPostController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysRelationController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysRelationController.java
deleted file mode 100644
index c8b786b..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysRelationController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 角色和菜单关联表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysRelation")
-public class SysRelationController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysRoleController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysRoleController.java
deleted file mode 100644
index ace690c..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysRoleController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 角色信息表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysRole")
-public class SysRoleController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysRoleDeptController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysRoleDeptController.java
deleted file mode 100644
index 4a58348..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysRoleDeptController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 角色和部门关联表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysRoleDept")
-public class SysRoleDeptController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysRoleMenuController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysRoleMenuController.java
deleted file mode 100644
index 816d66e..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysRoleMenuController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 角色和菜单关联表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysRoleMenu")
-public class SysRoleMenuController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysUserController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysUserController.java
deleted file mode 100644
index b857ebb..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysUserController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 用户信息表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysUser")
-public class SysUserController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysUserPostController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysUserPostController.java
deleted file mode 100644
index 413e6ba..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysUserPostController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 用户与岗位关联表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysUserPost")
-public class SysUserPostController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysUserRoleController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysUserRoleController.java
deleted file mode 100644
index 3ca08b9..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/SysUserRoleController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.management.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 用户和角色关联表 前端控制器
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Controller
-@RequestMapping("/sysUserRole")
-public class SysUserRoleController {
-
-}
-
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java
index 05a896e..4372e74 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TFeedbackController.java
@@ -12,6 +12,8 @@
import com.ruoyi.management.query.UseGuideQuery;
import com.ruoyi.management.service.ITFeedbackService;
import com.ruoyi.management.vo.FeedbackVO;
+import com.ruoyi.study.api.domain.TUser;
+import com.ruoyi.study.api.feignClient.StudyClient;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -42,6 +44,8 @@
return R.ok();
}
+ @Autowired
+ private StudyClient studyClient;
@ResponseBody
@PostMapping("/listAll")
@ApiOperation(value = "列表查询", tags = {"反馈管理"})
@@ -52,9 +56,35 @@
// query.getEndTime().setSeconds(59);
// }
List<FeedbackVO> list = feedbackService.listAll(query);
+ List<FeedbackVO> result = new ArrayList<>();
+ for (FeedbackVO feedbackVO : list) {
+ TUser data = studyClient.getUserById(feedbackVO.getUserId()).getData();
+ if (data == null )continue;
+
+ feedbackVO.setName(data.getName());
+ feedbackVO.setPhone(data.getPhone());
+ if (!StringUtils.hasLength(query.getPhone()) && !StringUtils.hasLength(query.getUserName())) {
+ result.add(feedbackVO);
+ continue;
+ }
+ // 如果筛选条件输入了电话或者姓名那么需要过滤掉不符合条件的数据
+ if (StringUtils.hasLength(query.getPhone()) && StringUtils.hasLength(query.getUserName())) {
+ if (feedbackVO.getPhone().contains(query.getPhone()) && feedbackVO.getName().contains(query.getUserName())) {
+ result.add(feedbackVO);
+ }
+ } else if (StringUtils.hasLength(query.getPhone())) {
+ if (feedbackVO.getPhone().contains(query.getPhone())) {
+ result.add(feedbackVO);
+ }
+ } else if (StringUtils.hasLength(query.getUserName())) {
+ if (feedbackVO.getName().contains(query.getUserName())) {
+ result.add(feedbackVO);
+ }
+ }
+ }
PageInfo<FeedbackVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
- res.setTotal(list.size());
- res.setRecords(list);
+ res.setTotal(result.size());
+ res.setRecords(result);
return AjaxResult.success(res);
}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TGoodsController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TGoodsController.java
index 961c453..bf2f807 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TGoodsController.java
@@ -1,7 +1,6 @@
package com.ruoyi.management.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -10,9 +9,6 @@
import com.ruoyi.goods.api.feignClient.GoodsClient;
import com.ruoyi.goods.api.model.GoodsTypeQuery;
import com.ruoyi.goods.api.model.TGoodsVO;
-import com.ruoyi.management.service.ITGoodsService;
-import com.ruoyi.management.service.ITGoodsTypeService;
-import com.ruoyi.management.service.ITOrderService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -31,12 +27,7 @@
@Controller
@RequestMapping("/tGoods")
public class TGoodsController {
- @Autowired
- private ITGoodsService goodsService;
- @Autowired
- private ITGoodsTypeService goodsTypeService;
- @Autowired
- private ITOrderService orderService;
+
@Autowired
private GoodsClient goodsClient;
@ResponseBody
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TOrderController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TOrderController.java
index 375db86..d0d4c18 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TOrderController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TOrderController.java
@@ -1,16 +1,12 @@
package com.ruoyi.management.controller;
-import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.goods.api.feignClient.GoodsClient;
import com.ruoyi.goods.api.model.OrderDTO;
import com.ruoyi.goods.api.model.OrderQuery;
import com.ruoyi.goods.api.model.TOrderVO;
-import com.ruoyi.management.service.ITGoodsService;
-import com.ruoyi.management.service.ITOrderService;
-import com.ruoyi.management.service.ITUserService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -31,12 +27,7 @@
@Controller
@RequestMapping("/tOrder")
public class TOrderController {
- @Autowired
- private ITOrderService tOrderService;
- @Autowired
- private ITUserService userService;
- @Autowired
- private ITGoodsService goodsService;
+
@Autowired
private GoodsClient goodsClient;
@ResponseBody
@@ -75,7 +66,7 @@
// byId.setExpressTime(new Date());
// tOrderService.updateById(byId);
goodsClient.getGoodsInfo1(dto);
- R.tokenError("登陆失效");
+// R.tokenError("登陆失效");
return AjaxResult.success("修改成功");
}
}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
index d7a1add..7e84cd7 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
@@ -4,23 +4,21 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.constant.RedisConstants;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.management.domain.SysUser;
-import com.ruoyi.management.domain.TUser;
import com.ruoyi.management.domain.TVipSet;
-import com.ruoyi.management.service.ISysUserService;
-import com.ruoyi.management.service.ITUserService;
import com.ruoyi.management.service.ITVipSetService;
import com.ruoyi.management.vo.VipSetVO;
+import com.ruoyi.study.api.domain.TUser;
import com.ruoyi.study.api.dto.AppUserQuery;
import com.ruoyi.study.api.dto.UserInfoQuery;
import com.ruoyi.study.api.feignClient.StudyClient;
import com.ruoyi.study.api.model.TGameRecord;
import com.ruoyi.study.api.vo.*;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -28,8 +26,6 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -44,14 +40,11 @@
@RequestMapping("/tUser")
public class TUserController {
@Autowired
- private ITUserService userService;
- @Autowired
private ITVipSetService vipSetService;
@Autowired
private StudyClient studyClient;
- @Autowired
- private ISysUserService sysUserService;
+
@PostMapping("/userList")
@ApiOperation(value = "用户列表", tags = {"用户管理"})
@@ -147,8 +140,8 @@
@PostMapping("/freeze")
@ApiOperation(value = "冻结/解冻", tags = {"用户管理"})
public AjaxResult freeze(Integer id) {
- TUser byId = userService.getById(id);
- if (byId.getState() == 1) {
+ TUser data = studyClient.getUserById(id).getData();
+ if (data.getState() == 1) {
studyClient.freeze(id);
return AjaxResult.success("冻结成功");
} else {
@@ -166,8 +159,7 @@
@ApiImplicitParam(value = "新密码", name = "password", dataType = "string", required = true),
})
public AjaxResult updatePassword(String phone,String phoneCode,String password) {
- SysUser one = sysUserService.getOne(new QueryWrapper<SysUser>()
- .eq("phonenumber", phone).eq("del_flag", 0));
+ SysUser one = sysUserClient.getSysUserByPhonenumber(phone).getData();
if (one == null){
return AjaxResult.error("账号不存在!");
}
@@ -190,21 +182,23 @@
return AjaxResult.error("新密码不能与旧密码相同");
}
one.setPassword(SecurityUtils.encryptPassword(password));
- sysUserService.updateById(one);
+ sysUserClient.updatePassword1(one);
return AjaxResult.success();
}
+
+ @Autowired
+ private SysUserClient sysUserClient;
@GetMapping("/sendPhoneCode")
@ApiOperation(value = "发送手机验证码", tags = {"管理后台-修改密码"})
@ApiImplicitParams({
@ApiImplicitParam(value = "手机号", name = "phone", dataType = "string", required = true),
})
public R<?> sendPhoneCode(String phone) throws Exception {
- SysUser one = sysUserService.getOne(new QueryWrapper<SysUser>()
- .eq("phonenumber", phone).eq("del_flag", 0));
- if (one == null){
+ SysUser data = sysUserClient.getSysUserByPhonenumber(phone).getData();
+ if (data == null){
return R.fail("账号不存在!");
}
- return userService.phoneCode(phone) ? R.ok() : R.fail();
+ return vipSetService.phoneCode(phone) ? R.ok() : R.fail();
}
@PostMapping("/getVipSet")
@ApiOperation(value = "获取会员设置", tags = {"用户管理"})
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysDept.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysDept.java
deleted file mode 100644
index 68891ff..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysDept.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package com.ruoyi.management.domain;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.web.domain.BaseModel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * <p>
- * 部门表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-
-@TableName("sys_dept")
-public class SysDept extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 部门id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Long deptId;
- /**
- * 父部门id
- */
- private Long parentId;
- /**
- * 祖级列表
- */
- private String ancestors;
- /**
- * 部门名称
- */
- private String deptName;
- /**
- * 显示顺序
- */
- private Integer orderNum;
- /**
- * 负责人
- */
- private String leader;
- /**
- * 联系电话
- */
- private String phone;
- /**
- * 邮箱
- */
- private String email;
- /**
- * 部门状态（0正常 1停用）
- */
- private String status;
- /**
- * 删除标志（0代表存在 2代表删除）
- */
- private String delFlag;
- /**
- * 创建者
- */
- private String createBy;
- /**
- * 创建时间
- */
- private Date createTime;
- /**
- * 更新者
- */
- private String updateBy;
- /**
- * 更新时间
- */
-
- private Date updateTime;
-
-
- public Long getDeptId() {
- return deptId;
- }
-
- public void setDeptId(Long deptId) {
- this.deptId = deptId;
- }
-
- public Long getParentId() {
- return parentId;
- }
-
- public void setParentId(Long parentId) {
- this.parentId = parentId;
- }
-
- public String getAncestors() {
- return ancestors;
- }
-
- public void setAncestors(String ancestors) {
- this.ancestors = ancestors;
- }
-
- public String getDeptName() {
- return deptName;
- }
-
- public void setDeptName(String deptName) {
- this.deptName = deptName;
- }
-
- public Integer getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(Integer orderNum) {
- this.orderNum = orderNum;
- }
-
- public String getLeader() {
- return leader;
- }
-
- public void setLeader(String leader) {
- this.leader = leader;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getDelFlag() {
- return delFlag;
- }
-
- public void setDelFlag(String delFlag) {
- this.delFlag = delFlag;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- @Override
- public String toString() {
- return "SysDept{" +
- ", deptId=" + deptId +
- ", parentId=" + parentId +
- ", ancestors=" + ancestors +
- ", deptName=" + deptName +
- ", orderNum=" + orderNum +
- ", leader=" + leader +
- ", phone=" + phone +
- ", email=" + email +
- ", status=" + status +
- ", delFlag=" + delFlag +
- ", createBy=" + createBy +
- ", createTime=" + createTime +
- ", updateBy=" + updateBy +
- ", updateTime=" + updateTime +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysDict.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysDict.java
deleted file mode 100644
index a126cca..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysDict.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.ruoyi.management.domain;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.web.domain.BaseModel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
-/**
- * <p>
- * 字典表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_dict")
-public class SysDict extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 排序
- */
- private Integer num;
- /**
- * 父级字典
- */
- private Integer pid;
- /**
- * 名称
- */
- private String name;
- /**
- * 提示
- */
- private String tips;
- /**
- * 值
- */
- private String code;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getNum() {
- return num;
- }
-
- public void setNum(Integer num) {
- this.num = num;
- }
-
- public Integer getPid() {
- return pid;
- }
-
- public void setPid(Integer pid) {
- this.pid = pid;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getTips() {
- return tips;
- }
-
- public void setTips(String tips) {
- this.tips = tips;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- @Override
- public String toString() {
- return "SysDict{" +
- ", id=" + id +
- ", num=" + num +
- ", pid=" + pid +
- ", name=" + name +
- ", tips=" + tips +
- ", code=" + code +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysDictData.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysDictData.java
deleted file mode 100644
index 98704e7..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysDictData.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.ruoyi.management.domain;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.web.domain.BaseModel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 字典数据表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_dict_data")
-public class SysDictData extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 字典编码
- */
- @TableId(value = "dict_code", type = IdType.AUTO)
- private Long dictCode;
- /**
- * 字典排序
- */
- private Integer dictSort;
- /**
- * 字典标签
- */
- private String dictLabel;
- /**
- * 字典键值
- */
- private String dictValue;
- /**
- * 字典类型
- */
- private String dictType;
- /**
- * 样式属性（其他样式扩展）
- */
- private String cssClass;
- /**
- * 表格回显样式
- */
- private String listClass;
- /**
- * 是否默认（Y是 N否）
- */
- private String isDefault;
- /**
- * 状态（0正常 1停用）
- */
- private String status;
- /**
- * 创建者
- */
- private String createBy;
- /**
- * 创建时间
- */
- private Date createTime;
- /**
- * 更新者
- */
- private String updateBy;
- /**
- * 更新时间
- */
- private Date updateTime;
- /**
- * 备注
- */
- private String remark;
-
-
- public Long getDictCode() {
- return dictCode;
- }
-
- public void setDictCode(Long dictCode) {
- this.dictCode = dictCode;
- }
-
- public Integer getDictSort() {
- return dictSort;
- }
-
- public void setDictSort(Integer dictSort) {
- this.dictSort = dictSort;
- }
-
- public String getDictLabel() {
- return dictLabel;
- }
-
- public void setDictLabel(String dictLabel) {
- this.dictLabel = dictLabel;
- }
-
- public String getDictValue() {
- return dictValue;
- }
-
- public void setDictValue(String dictValue) {
- this.dictValue = dictValue;
- }
-
- public String getDictType() {
- return dictType;
- }
-
- public void setDictType(String dictType) {
- this.dictType = dictType;
- }
-
- public String getCssClass() {
- return cssClass;
- }
-
- public void setCssClass(String cssClass) {
- this.cssClass = cssClass;
- }
-
- public String getListClass() {
- return listClass;
- }
-
- public void setListClass(String listClass) {
- this.listClass = listClass;
- }
-
- public String getIsDefault() {
- return isDefault;
- }
-
- public void setIsDefault(String isDefault) {
- this.isDefault = isDefault;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- @Override
- public String toString() {
- return "SysDictData{" +
- ", dictCode=" + dictCode +
- ", dictSort=" + dictSort +
- ", dictLabel=" + dictLabel +
- ", dictValue=" + dictValue +
- ", dictType=" + dictType +
- ", cssClass=" + cssClass +
- ", listClass=" + listClass +
- ", isDefault=" + isDefault +
- ", status=" + status +
- ", createBy=" + createBy +
- ", createTime=" + createTime +
- ", updateBy=" + updateBy +
- ", updateTime=" + updateTime +
- ", remark=" + remark +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysDictType.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysDictType.java
deleted file mode 100644
index 390a73e..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysDictType.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.ruoyi.management.domain;
-
-
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.ruoyi.common.core.web.domain.BaseModel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 字典类型表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_dict_type")
-public class SysDictType extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 字典主键
- */
- @TableId(value = "dict_id", type = IdType.AUTO)
- private Long dictId;
- /**
- * 字典名称
- */
- @TableField("dict_name")
- private String dictName;
- /**
- * 字典类型
- */
- @TableField("dict_type")
- private String dictType;
- /**
- * 状态（0正常 1停用）
- */
- private String status;
- /**
- * 创建者
- */
- @TableField("create_by")
- private String createBy;
- /**
- * 创建时间
- */
- @TableField("create_time")
- private Date createTime;
- /**
- * 更新者
- */
- @TableField("update_by")
- private String updateBy;
- /**
- * 更新时间
- */
- @TableField("update_time")
- private Date updateTime;
- /**
- * 备注
- */
- private String remark;
-
-
- public Long getDictId() {
- return dictId;
- }
-
- public void setDictId(Long dictId) {
- this.dictId = dictId;
- }
-
- public String getDictName() {
- return dictName;
- }
-
- public void setDictName(String dictName) {
- this.dictName = dictName;
- }
-
- public String getDictType() {
- return dictType;
- }
-
- public void setDictType(String dictType) {
- this.dictType = dictType;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- @Override
- public String toString() {
- return "SysDictType{" +
- ", dictId=" + dictId +
- ", dictName=" + dictName +
- ", dictType=" + dictType +
- ", status=" + status +
- ", createBy=" + createBy +
- ", createTime=" + createTime +
- ", updateBy=" + updateBy +
- ", updateTime=" + updateTime +
- ", remark=" + remark +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysExpense.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysExpense.java
deleted file mode 100644
index 8d611c8..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysExpense.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.ruoyi.management.domain;
-
-
-import java.math.BigDecimal;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.web.domain.BaseModel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 报销表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_expense")
-public class SysExpense extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 报销金额
- */
- private BigDecimal money;
- /**
- * 描述
- */
- private String desc;
- /**
- * 创建时间
- */
- private Date createtime;
- /**
- * 状态: 1.待提交 2:待审核 3.审核通过 4:驳回
- */
- private Integer state;
- /**
- * 用户id
- */
- private Integer userid;
- /**
- * 流程定义id
- */
- private String processId;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public BigDecimal getMoney() {
- return money;
- }
-
- public void setMoney(BigDecimal money) {
- this.money = money;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-
- public Date getCreatetime() {
- return createtime;
- }
-
- public void setCreatetime(Date createtime) {
- this.createtime = createtime;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Integer getUserid() {
- return userid;
- }
-
- public void setUserid(Integer userid) {
- this.userid = userid;
- }
-
- public String getProcessId() {
- return processId;
- }
-
- public void setProcessId(String processId) {
- this.processId = processId;
- }
-
- @Override
- public String toString() {
- return "SysExpense{" +
- ", id=" + id +
- ", money=" + money +
- ", desc=" + desc +
- ", createtime=" + createtime +
- ", state=" + state +
- ", userid=" + userid +
- ", processId=" + processId +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysJob.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysJob.java
deleted file mode 100644
index fe0351b..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysJob.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package com.ruoyi.management.domain;
-
-
-import java.util.Date;
-
-import com.ruoyi.common.core.web.domain.BaseModel;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-/**
- * <p>
- * 定时任务调度表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_job")
-public class SysJob extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 任务ID
- */
- @TableId(value = "job_id", type = IdType.AUTO)
- private Long jobId;
- /**
- * 任务名称
- */
- @TableField("job_name")
- private String jobName;
- /**
- * 任务组名
- */
- @TableField("job_group")
- private String jobGroup;
- /**
- * 调用目标字符串
- */
- @TableField("invoke_target")
- private String invokeTarget;
- /**
- * cron执行表达式
- */
- @TableField("cron_expression")
- private String cronExpression;
- /**
- * 计划执行错误策略（1立即执行 2执行一次 3放弃执行）
- */
- @TableField("misfire_policy")
- private String misfirePolicy;
- /**
- * 是否并发执行（0允许 1禁止）
- */
- private String concurrent;
- /**
- * 状态（0正常 1暂停）
- */
- private String status;
- /**
- * 创建者
- */
- @TableField("create_by")
- private String createBy;
- /**
- * 创建时间
- */
- @TableField("create_time")
- private Date createTime;
- /**
- * 更新者
- */
- @TableField("update_by")
- private String updateBy;
- /**
- * 更新时间
- */
- @TableField("update_time")
- private Date updateTime;
- /**
- * 备注信息
- */
- private String remark;
-
-
- public Long getJobId() {
- return jobId;
- }
-
- public void setJobId(Long jobId) {
- this.jobId = jobId;
- }
-
- public String getJobName() {
- return jobName;
- }
-
- public void setJobName(String jobName) {
- this.jobName = jobName;
- }
-
- public String getJobGroup() {
- return jobGroup;
- }
-
- public void setJobGroup(String jobGroup) {
- this.jobGroup = jobGroup;
- }
-
- public String getInvokeTarget() {
- return invokeTarget;
- }
-
- public void setInvokeTarget(String invokeTarget) {
- this.invokeTarget = invokeTarget;
- }
-
- public String getCronExpression() {
- return cronExpression;
- }
-
- public void setCronExpression(String cronExpression) {
- this.cronExpression = cronExpression;
- }
-
- public String getMisfirePolicy() {
- return misfirePolicy;
- }
-
- public void setMisfirePolicy(String misfirePolicy) {
- this.misfirePolicy = misfirePolicy;
- }
-
- public String getConcurrent() {
- return concurrent;
- }
-
- public void setConcurrent(String concurrent) {
- this.concurrent = concurrent;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- @Override
- public String toString() {
- return "SysJob{" +
- ", jobId=" + jobId +
- ", jobName=" + jobName +
- ", jobGroup=" + jobGroup +
- ", invokeTarget=" + invokeTarget +
- ", cronExpression=" + cronExpression +
- ", misfirePolicy=" + misfirePolicy +
- ", concurrent=" + concurrent +
- ", status=" + status +
- ", createBy=" + createBy +
- ", createTime=" + createTime +
- ", updateBy=" + updateBy +
- ", updateTime=" + updateTime +
- ", remark=" + remark +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysJobLog.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysJobLog.java
deleted file mode 100644
index 772826d..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysJobLog.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.ruoyi.management.domain;
-
-
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 定时任务调度日志表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_job_log")
-public class SysJobLog extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 任务日志ID
- */
- @TableId(value = "job_log_id", type = IdType.AUTO)
- private Long jobLogId;
- /**
- * 任务名称
- */
- @TableField("job_name")
- private String jobName;
- /**
- * 任务组名
- */
- @TableField("job_group")
- private String jobGroup;
- /**
- * 调用目标字符串
- */
- @TableField("invoke_target")
- private String invokeTarget;
- /**
- * 日志信息
- */
- @TableField("job_message")
- private String jobMessage;
- /**
- * 执行状态（0正常 1失败）
- */
- private String status;
- /**
- * 异常信息
- */
- @TableField("exception_info")
- private String exceptionInfo;
- /**
- * 创建时间
- */
- @TableField("create_time")
- private Date createTime;
-
-
- public Long getJobLogId() {
- return jobLogId;
- }
-
- public void setJobLogId(Long jobLogId) {
- this.jobLogId = jobLogId;
- }
-
- public String getJobName() {
- return jobName;
- }
-
- public void setJobName(String jobName) {
- this.jobName = jobName;
- }
-
- public String getJobGroup() {
- return jobGroup;
- }
-
- public void setJobGroup(String jobGroup) {
- this.jobGroup = jobGroup;
- }
-
- public String getInvokeTarget() {
- return invokeTarget;
- }
-
- public void setInvokeTarget(String invokeTarget) {
- this.invokeTarget = invokeTarget;
- }
-
- public String getJobMessage() {
- return jobMessage;
- }
-
- public void setJobMessage(String jobMessage) {
- this.jobMessage = jobMessage;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getExceptionInfo() {
- return exceptionInfo;
- }
-
- public void setExceptionInfo(String exceptionInfo) {
- this.exceptionInfo = exceptionInfo;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- @Override
- public String toString() {
- return "SysJobLog{" +
- ", jobLogId=" + jobLogId +
- ", jobName=" + jobName +
- ", jobGroup=" + jobGroup +
- ", invokeTarget=" + invokeTarget +
- ", jobMessage=" + jobMessage +
- ", status=" + status +
- ", exceptionInfo=" + exceptionInfo +
- ", createTime=" + createTime +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysLoginLog.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysLoginLog.java
deleted file mode 100644
index f2433f6..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysLoginLog.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.ruoyi.management.domain;
-
-
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 登录记录
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_login_log")
-public class SysLoginLog extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 日志名称
- */
- private String logname;
- /**
- * 管理员id
- */
- private Integer userid;
- /**
- * 创建时间
- */
- private Date createtime;
- /**
- * 是否执行成功
- */
- private String succeed;
- /**
- * 具体消息
- */
- private String message;
- /**
- * 登录ip
- */
- private String ip;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getLogname() {
- return logname;
- }
-
- public void setLogname(String logname) {
- this.logname = logname;
- }
-
- public Integer getUserid() {
- return userid;
- }
-
- public void setUserid(Integer userid) {
- this.userid = userid;
- }
-
- public Date getCreatetime() {
- return createtime;
- }
-
- public void setCreatetime(Date createtime) {
- this.createtime = createtime;
- }
-
- public String getSucceed() {
- return succeed;
- }
-
- public void setSucceed(String succeed) {
- this.succeed = succeed;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- public String getIp() {
- return ip;
- }
-
- public void setIp(String ip) {
- this.ip = ip;
- }
-
- @Override
- public String toString() {
- return "SysLoginLog{" +
- ", id=" + id +
- ", logname=" + logname +
- ", userid=" + userid +
- ", createtime=" + createtime +
- ", succeed=" + succeed +
- ", message=" + message +
- ", ip=" + ip +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysLogininfor.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysLogininfor.java
deleted file mode 100644
index b488e67..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysLogininfor.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.ruoyi.management.domain;
-
-
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 系统访问记录
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_logininfor")
-public class SysLogininfor extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 访问ID
- */
- @TableId(value = "info_id", type = IdType.AUTO)
- private Long infoId;
- /**
- * 用户账号
- */
- @TableField("user_name")
- private String userName;
- /**
- * 登录IP地址
- */
- private String ipaddr;
- /**
- * 登录状态（0成功 1失败）
- */
- private String status;
- /**
- * 提示信息
- */
- private String msg;
- /**
- * 访问时间
- */
- @TableField("access_time")
- private Date accessTime;
-
-
- public Long getInfoId() {
- return infoId;
- }
-
- public void setInfoId(Long infoId) {
- this.infoId = infoId;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getIpaddr() {
- return ipaddr;
- }
-
- public void setIpaddr(String ipaddr) {
- this.ipaddr = ipaddr;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- public Date getAccessTime() {
- return accessTime;
- }
-
- public void setAccessTime(Date accessTime) {
- this.accessTime = accessTime;
- }
-
- @Override
- public String toString() {
- return "SysLogininfor{" +
- ", infoId=" + infoId +
- ", userName=" + userName +
- ", ipaddr=" + ipaddr +
- ", status=" + status +
- ", msg=" + msg +
- ", accessTime=" + accessTime +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysMenu.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysMenu.java
deleted file mode 100644
index 5b941a8..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysMenu.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package com.ruoyi.management.domain;
-
-
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 菜单权限表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_menu")
-public class SysMenu extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 菜单ID
- */
- @TableId(value = "menu_id", type = IdType.AUTO)
- private Long menuId;
- /**
- * 菜单名称
- */
- @TableField("menu_name")
- private String menuName;
- /**
- * 父菜单ID
- */
- @TableField("parent_id")
- private Long parentId;
- /**
- * 显示顺序
- */
- @TableField("order_num")
- private Integer orderNum;
- /**
- * 路由地址
- */
- private String path;
- /**
- * 组件路径
- */
- private String component;
- /**
- * 路由参数
- */
- private String query;
- /**
- * 是否为外链（0是 1否）
- */
- @TableField("is_frame")
- private Integer isFrame;
- /**
- * 是否缓存（0缓存 1不缓存）
- */
- @TableField("is_cache")
- private Integer isCache;
- /**
- * 菜单类型（M目录 C菜单 F按钮）
- */
- @TableField("menu_type")
- private String menuType;
- /**
- * 菜单状态（0显示 1隐藏）
- */
- private String visible;
- /**
- * 菜单状态（0正常 1停用）
- */
- private Integer status;
- /**
- * 权限标识
- */
- private String perms;
- /**
- * 菜单图标
- */
- private String icon;
- /**
- * 创建者
- */
- @TableField("create_by")
- private String createBy;
- /**
- * 创建时间
- */
- @TableField("create_time")
- private Date createTime;
- /**
- * 更新者
- */
- @TableField("update_by")
- private String updateBy;
- /**
- * 更新时间
- */
- @TableField("update_time")
- private Date updateTime;
- /**
- * 备注
- */
- private String remark;
-
-
- public Long getMenuId() {
- return menuId;
- }
-
- public void setMenuId(Long menuId) {
- this.menuId = menuId;
- }
-
- public String getMenuName() {
- return menuName;
- }
-
- public void setMenuName(String menuName) {
- this.menuName = menuName;
- }
-
- public Long getParentId() {
- return parentId;
- }
-
- public void setParentId(Long parentId) {
- this.parentId = parentId;
- }
-
- public Integer getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(Integer orderNum) {
- this.orderNum = orderNum;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- public String getComponent() {
- return component;
- }
-
- public void setComponent(String component) {
- this.component = component;
- }
-
- public String getQuery() {
- return query;
- }
-
- public void setQuery(String query) {
- this.query = query;
- }
-
- public Integer getIsFrame() {
- return isFrame;
- }
-
- public void setIsFrame(Integer isFrame) {
- this.isFrame = isFrame;
- }
-
- public Integer getIsCache() {
- return isCache;
- }
-
- public void setIsCache(Integer isCache) {
- this.isCache = isCache;
- }
-
- public String getMenuType() {
- return menuType;
- }
-
- public void setMenuType(String menuType) {
- this.menuType = menuType;
- }
-
- public String getVisible() {
- return visible;
- }
-
- public void setVisible(String visible) {
- this.visible = visible;
- }
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public String getPerms() {
- return perms;
- }
-
- public void setPerms(String perms) {
- this.perms = perms;
- }
-
- public String getIcon() {
- return icon;
- }
-
- public void setIcon(String icon) {
- this.icon = icon;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- @Override
- public String toString() {
- return "SysMenu{" +
- ", menuId=" + menuId +
- ", menuName=" + menuName +
- ", parentId=" + parentId +
- ", orderNum=" + orderNum +
- ", path=" + path +
- ", component=" + component +
- ", query=" + query +
- ", isFrame=" + isFrame +
- ", isCache=" + isCache +
- ", menuType=" + menuType +
- ", visible=" + visible +
- ", status=" + status +
- ", perms=" + perms +
- ", icon=" + icon +
- ", createBy=" + createBy +
- ", createTime=" + createTime +
- ", updateBy=" + updateBy +
- ", updateTime=" + updateTime +
- ", remark=" + remark +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysNotice.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysNotice.java
deleted file mode 100644
index 1da8dc2..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysNotice.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.ruoyi.management.domain;
-
-
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 通知公告表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_notice")
-public class SysNotice extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 公告ID
- */
- @TableId(value = "notice_id", type = IdType.AUTO)
- private Integer noticeId;
- /**
- * 公告标题
- */
- @TableField("notice_title")
- private String noticeTitle;
- /**
- * 公告类型（1通知 2公告）
- */
- @TableField("notice_type")
- private String noticeType;
-
- /**
- * 公告状态（0正常 1关闭）
- */
- private String status;
- /**
- * 创建者
- */
- @TableField("create_by")
- private String createBy;
- /**
- * 创建时间
- */
- @TableField("create_time")
- private Date createTime;
- /**
- * 更新者
- */
- @TableField("update_by")
- private String updateBy;
- /**
- * 更新时间
- */
- @TableField("update_time")
- private Date updateTime;
- /**
- * 备注
- */
- private String remark;
-
-
- public Integer getNoticeId() {
- return noticeId;
- }
-
- public void setNoticeId(Integer noticeId) {
- this.noticeId = noticeId;
- }
-
- public String getNoticeTitle() {
- return noticeTitle;
- }
-
- public void setNoticeTitle(String noticeTitle) {
- this.noticeTitle = noticeTitle;
- }
-
- public String getNoticeType() {
- return noticeType;
- }
-
- public void setNoticeType(String noticeType) {
- this.noticeType = noticeType;
- }
-
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- @Override
- public String toString() {
- return "SysNotice{" +
- ", noticeId=" + noticeId +
- ", noticeTitle=" + noticeTitle +
- ", noticeType=" + noticeType +
- ", status=" + status +
- ", createBy=" + createBy +
- ", createTime=" + createTime +
- ", updateBy=" + updateBy +
- ", updateTime=" + updateTime +
- ", remark=" + remark +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysOperationLog.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysOperationLog.java
deleted file mode 100644
index 55696a2..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysOperationLog.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.ruoyi.management.domain;
-
-
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 操作日志
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_operation_log")
-public class SysOperationLog extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 日志类型
- */
- private String logtype;
- /**
- * 日志名称
- */
- private String logname;
- /**
- * 用户id
- */
- private Integer userid;
- /**
- * 类名称
- */
- private String classname;
- /**
- * 方法名称
- */
- private String method;
- /**
- * 创建时间
- */
- private Date createtime;
- /**
- * 是否成功
- */
- private String succeed;
- /**
- * 备注
- */
- private String message;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getLogtype() {
- return logtype;
- }
-
- public void setLogtype(String logtype) {
- this.logtype = logtype;
- }
-
- public String getLogname() {
- return logname;
- }
-
- public void setLogname(String logname) {
- this.logname = logname;
- }
-
- public Integer getUserid() {
- return userid;
- }
-
- public void setUserid(Integer userid) {
- this.userid = userid;
- }
-
- public String getClassname() {
- return classname;
- }
-
- public void setClassname(String classname) {
- this.classname = classname;
- }
-
- public String getMethod() {
- return method;
- }
-
- public void setMethod(String method) {
- this.method = method;
- }
-
- public Date getCreatetime() {
- return createtime;
- }
-
- public void setCreatetime(Date createtime) {
- this.createtime = createtime;
- }
-
- public String getSucceed() {
- return succeed;
- }
-
- public void setSucceed(String succeed) {
- this.succeed = succeed;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- @Override
- public String toString() {
- return "SysOperationLog{" +
- ", id=" + id +
- ", logtype=" + logtype +
- ", logname=" + logname +
- ", userid=" + userid +
- ", classname=" + classname +
- ", method=" + method +
- ", createtime=" + createtime +
- ", succeed=" + succeed +
- ", message=" + message +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysPost.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysPost.java
deleted file mode 100644
index 371f692..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysPost.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package com.ruoyi.management.domain;
-
-
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 岗位信息表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_post")
-public class SysPost extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 岗位ID
- */
- @TableId(value = "post_id", type = IdType.AUTO)
- private Long postId;
- /**
- * 岗位编码
- */
- @TableField("post_code")
- private String postCode;
- /**
- * 岗位名称
- */
- @TableField("post_name")
- private String postName;
- /**
- * 显示顺序
- */
- @TableField("post_sort")
- private Integer postSort;
- /**
- * 状态（0正常 1停用）
- */
- private String status;
- /**
- * 创建者
- */
- @TableField("create_by")
- private String createBy;
- /**
- * 创建时间
- */
- @TableField("create_time")
- private Date createTime;
- /**
- * 更新者
- */
- @TableField("update_by")
- private String updateBy;
- /**
- * 更新时间
- */
- @TableField("update_time")
- private Date updateTime;
- /**
- * 备注
- */
- private String remark;
-
-
- public Long getPostId() {
- return postId;
- }
-
- public void setPostId(Long postId) {
- this.postId = postId;
- }
-
- public String getPostCode() {
- return postCode;
- }
-
- public void setPostCode(String postCode) {
- this.postCode = postCode;
- }
-
- public String getPostName() {
- return postName;
- }
-
- public void setPostName(String postName) {
- this.postName = postName;
- }
-
- public Integer getPostSort() {
- return postSort;
- }
-
- public void setPostSort(Integer postSort) {
- this.postSort = postSort;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- @Override
- public String toString() {
- return "SysPost{" +
- ", postId=" + postId +
- ", postCode=" + postCode +
- ", postName=" + postName +
- ", postSort=" + postSort +
- ", status=" + status +
- ", createBy=" + createBy +
- ", createTime=" + createTime +
- ", updateBy=" + updateBy +
- ", updateTime=" + updateTime +
- ", remark=" + remark +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysRelation.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysRelation.java
deleted file mode 100644
index 035bab6..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysRelation.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.ruoyi.management.domain;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 角色和菜单关联表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_relation")
-public class SysRelation extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 菜单id
- */
- private Long menuid;
- /**
- * 角色id
- */
- private Integer roleid;
-
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Long getMenuid() {
- return menuid;
- }
-
- public void setMenuid(Long menuid) {
- this.menuid = menuid;
- }
-
- public Integer getRoleid() {
- return roleid;
- }
-
- public void setRoleid(Integer roleid) {
- this.roleid = roleid;
- }
-
- @Override
- public String toString() {
- return "SysRelation{" +
- ", id=" + id +
- ", menuid=" + menuid +
- ", roleid=" + roleid +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysRole.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysRole.java
deleted file mode 100644
index 5b4a40f..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysRole.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package com.ruoyi.management.domain;
-
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 角色信息表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_role")
-public class SysRole extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 角色ID
- */
- @TableId(value = "role_id", type = IdType.AUTO)
- private Long roleId;
- /**
- * 角色名称
- */
- @TableField("role_name")
- private String roleName;
- /**
- * 角色权限字符串
- */
- @TableField("role_key")
- private String roleKey;
- /**
- * 显示顺序
- */
- @TableField("role_sort")
- private Integer roleSort;
- /**
- * 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）
- */
- @TableField("data_scope")
- private String dataScope;
- /**
- * 菜单树选择项是否关联显示
- */
- @TableField("menu_check_strictly")
- private Integer menuCheckStrictly;
- /**
- * 部门树选择项是否关联显示
- */
- @TableField("dept_check_strictly")
- private Integer deptCheckStrictly;
- /**
- * 角色状态（0正常 1停用）
- */
- private String status;
- /**
- * 删除标志（0代表存在 2代表删除）
- */
- @TableField("del_flag")
- private String delFlag;
- /**
- * 创建者
- */
- @TableField("create_by")
- private String createBy;
- /**
- * 创建时间
- */
- @TableField("create_time")
- private Date createTime;
- /**
- * 更新者
- */
- @TableField("update_by")
- private String updateBy;
- /**
- * 更新时间
- */
- @TableField("update_time")
- private Date updateTime;
- /**
- * 备注
- */
- private String remark;
- /**
- * 车辆数据权限：1=所有数据 2=已租 3=未租 4=已租（仅自己负责的合同） 5=无数据权限
- */
- private Integer carDataAuth;
- /**
- * 车务数据权限：1=所有数据 2=已租 3=未租 4=已租（仅自己负责的合同） 5=无数据权限
- */
- private Integer carTrainOperAuth;
- /**
- * 合同数据权限：1=所有数据 2=仅自己负责的合同 3=无数据权限
- */
- private Integer contractDataAuth;
- /**
- * 公司id
- */
- private Integer companyId;
-
-
- public Long getRoleId() {
- return roleId;
- }
-
- public void setRoleId(Long roleId) {
- this.roleId = roleId;
- }
-
- public String getRoleName() {
- return roleName;
- }
-
- public void setRoleName(String roleName) {
- this.roleName = roleName;
- }
-
- public String getRoleKey() {
- return roleKey;
- }
-
- public void setRoleKey(String roleKey) {
- this.roleKey = roleKey;
- }
-
- public Integer getRoleSort() {
- return roleSort;
- }
-
- public void setRoleSort(Integer roleSort) {
- this.roleSort = roleSort;
- }
-
- public String getDataScope() {
- return dataScope;
- }
-
- public void setDataScope(String dataScope) {
- this.dataScope = dataScope;
- }
-
- public Integer getMenuCheckStrictly() {
- return menuCheckStrictly;
- }
-
- public void setMenuCheckStrictly(Integer menuCheckStrictly) {
- this.menuCheckStrictly = menuCheckStrictly;
- }
-
- public Integer getDeptCheckStrictly() {
- return deptCheckStrictly;
- }
-
- public void setDeptCheckStrictly(Integer deptCheckStrictly) {
- this.deptCheckStrictly = deptCheckStrictly;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getDelFlag() {
- return delFlag;
- }
-
- public void setDelFlag(String delFlag) {
- this.delFlag = delFlag;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getCarDataAuth() {
- return carDataAuth;
- }
-
- public void setCarDataAuth(Integer carDataAuth) {
- this.carDataAuth = carDataAuth;
- }
-
- public Integer getCarTrainOperAuth() {
- return carTrainOperAuth;
- }
-
- public void setCarTrainOperAuth(Integer carTrainOperAuth) {
- this.carTrainOperAuth = carTrainOperAuth;
- }
-
- public Integer getContractDataAuth() {
- return contractDataAuth;
- }
-
- public void setContractDataAuth(Integer contractDataAuth) {
- this.contractDataAuth = contractDataAuth;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- @Override
- public String toString() {
- return "SysRole{" +
- ", roleId=" + roleId +
- ", roleName=" + roleName +
- ", roleKey=" + roleKey +
- ", roleSort=" + roleSort +
- ", dataScope=" + dataScope +
- ", menuCheckStrictly=" + menuCheckStrictly +
- ", deptCheckStrictly=" + deptCheckStrictly +
- ", status=" + status +
- ", delFlag=" + delFlag +
- ", createBy=" + createBy +
- ", createTime=" + createTime +
- ", updateBy=" + updateBy +
- ", updateTime=" + updateTime +
- ", remark=" + remark +
- ", carDataAuth=" + carDataAuth +
- ", carTrainOperAuth=" + carTrainOperAuth +
- ", contractDataAuth=" + contractDataAuth +
- ", companyId=" + companyId +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysRoleDept.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysRoleDept.java
deleted file mode 100644
index 499e054..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysRoleDept.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.ruoyi.management.domain;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 角色和部门关联表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_role_dept")
-public class SysRoleDept extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 角色ID
- */
- @TableId("role_id")
- private Long roleId;
- /**
- * 部门ID
- */
- @TableField("dept_id")
- private Long deptId;
-
-
- public Long getRoleId() {
- return roleId;
- }
-
- public void setRoleId(Long roleId) {
- this.roleId = roleId;
- }
-
- public Long getDeptId() {
- return deptId;
- }
-
- public void setDeptId(Long deptId) {
- this.deptId = deptId;
- }
-
- @Override
- public String toString() {
- return "SysRoleDept{" +
- ", roleId=" + roleId +
- ", deptId=" + deptId +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysRoleMenu.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysRoleMenu.java
deleted file mode 100644
index 65137a9..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysRoleMenu.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.ruoyi.management.domain;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 角色和菜单关联表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_role_menu")
-public class SysRoleMenu extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 角色ID
- */
- @TableId("role_id")
- private Long roleId;
- /**
- * 菜单ID
- */
- @TableField("menu_id")
- private Long menuId;
-
-
- public Long getRoleId() {
- return roleId;
- }
-
- public void setRoleId(Long roleId) {
- this.roleId = roleId;
- }
-
- public Long getMenuId() {
- return menuId;
- }
-
- public void setMenuId(Long menuId) {
- this.menuId = menuId;
- }
-
- @Override
- public String toString() {
- return "SysRoleMenu{" +
- ", roleId=" + roleId +
- ", menuId=" + menuId +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysUser.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysUser.java
deleted file mode 100644
index b3fb95a..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysUser.java
+++ /dev/null
@@ -1,331 +0,0 @@
-package com.ruoyi.management.domain;
-
-
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 用户信息表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_user")
-public class SysUser extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 用户ID
- */
- @TableId(value = "user_id", type = IdType.AUTO)
- private Long userId;
- /**
- * 部门ID
- */
- @TableField("dept_id")
- private Long deptId;
- /**
- * 用户账号
- */
- @TableField("user_name")
- private String userName;
- /**
- * 用户昵称
- */
- @TableField("nick_name")
- private String nickName;
- /**
- * 用户类型（00系统用户）
- */
- @TableField("user_type")
- private String userType;
- /**
- * 用户邮箱
- */
- private String email;
- /**
- * 手机号码
- */
- private String phonenumber;
- /**
- * 用户性别（0男 1女 2未知）
- */
- private String sex;
- /**
- * 头像地址
- */
- private String avatar;
- /**
- * 密码
- */
- private String password;
- /**
- * 帐号状态（0正常 1停用）
- */
- private String status;
- /**
- * 删除标志（0代表存在 2代表删除）
- */
- @TableField("del_flag")
- private String delFlag;
- /**
- * 最后登录IP
- */
- @TableField("login_ip")
- private String loginIp;
- /**
- * 最后登录时间
- */
- @TableField("login_date")
- private Date loginDate;
- /**
- * 角色类型 1=平台 2=公司 3=门店 4=修理厂
- */
- private Integer roleType;
- /**
- * 密码修改时间
- */
- private Date passWordUpdate;
- /**
- * 对象ID
- */
- private Integer objectId;
- /**
- * 创建者
- */
- @TableField("create_by")
- private String createBy;
- /**
- * 创建时间
- */
- @TableField("create_time")
- private Date createTime;
- /**
- * 更新者
- */
- @TableField("update_by")
- private String updateBy;
- /**
- * 更新时间
- */
- @TableField("update_time")
- private Date updateTime;
- /**
- * 备注
- */
- private String remark;
-
-
- public Long getUserId() {
- return userId;
- }
-
- public void setUserId(Long userId) {
- this.userId = userId;
- }
-
- public Long getDeptId() {
- return deptId;
- }
-
- public void setDeptId(Long deptId) {
- this.deptId = deptId;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getNickName() {
- return nickName;
- }
-
- public void setNickName(String nickName) {
- this.nickName = nickName;
- }
-
- public String getUserType() {
- return userType;
- }
-
- public void setUserType(String userType) {
- this.userType = userType;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public String getPhonenumber() {
- return phonenumber;
- }
-
- public void setPhonenumber(String phonenumber) {
- this.phonenumber = phonenumber;
- }
-
- public String getSex() {
- return sex;
- }
-
- public void setSex(String sex) {
- this.sex = sex;
- }
-
- public String getAvatar() {
- return avatar;
- }
-
- public void setAvatar(String avatar) {
- this.avatar = avatar;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getDelFlag() {
- return delFlag;
- }
-
- public void setDelFlag(String delFlag) {
- this.delFlag = delFlag;
- }
-
- public String getLoginIp() {
- return loginIp;
- }
-
- public void setLoginIp(String loginIp) {
- this.loginIp = loginIp;
- }
-
- public Date getLoginDate() {
- return loginDate;
- }
-
- public void setLoginDate(Date loginDate) {
- this.loginDate = loginDate;
- }
-
- public Integer getRoleType() {
- return roleType;
- }
-
- public void setRoleType(Integer roleType) {
- this.roleType = roleType;
- }
-
- public Date getPassWordUpdate() {
- return passWordUpdate;
- }
-
- public void setPassWordUpdate(Date passWordUpdate) {
- this.passWordUpdate = passWordUpdate;
- }
-
- public Integer getObjectId() {
- return objectId;
- }
-
- public void setObjectId(Integer objectId) {
- this.objectId = objectId;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- @Override
- public String toString() {
- return "SysUser{" +
- ", userId=" + userId +
- ", deptId=" + deptId +
- ", userName=" + userName +
- ", nickName=" + nickName +
- ", userType=" + userType +
- ", email=" + email +
- ", phonenumber=" + phonenumber +
- ", sex=" + sex +
- ", avatar=" + avatar +
- ", password=" + password +
- ", status=" + status +
- ", delFlag=" + delFlag +
- ", loginIp=" + loginIp +
- ", loginDate=" + loginDate +
- ", roleType=" + roleType +
- ", passWordUpdate=" + passWordUpdate +
- ", objectId=" + objectId +
- ", createBy=" + createBy +
- ", createTime=" + createTime +
- ", updateBy=" + updateBy +
- ", updateTime=" + updateTime +
- ", remark=" + remark +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysUserPost.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysUserPost.java
deleted file mode 100644
index 80e0446..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysUserPost.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.ruoyi.management.domain;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 用户与岗位关联表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_user_post")
-public class SysUserPost extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 用户ID
- */
- @TableId("user_id")
- private Long userId;
- /**
- * 岗位ID
- */
- @TableField("post_id")
- private Long postId;
-
-
- public Long getUserId() {
- return userId;
- }
-
- public void setUserId(Long userId) {
- this.userId = userId;
- }
-
- public Long getPostId() {
- return postId;
- }
-
- public void setPostId(Long postId) {
- this.postId = postId;
- }
-
- @Override
- public String toString() {
- return "SysUserPost{" +
- ", userId=" + userId +
- ", postId=" + postId +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysUserRole.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysUserRole.java
deleted file mode 100644
index 2c2d44d..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/SysUserRole.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.ruoyi.management.domain;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.ruoyi.common.core.web.domain.BaseModel;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 用户和角色关联表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@TableName("sys_user_role")
-public class SysUserRole extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 用户ID
- */
- @TableId("user_id")
- private Long userId;
- /**
- * 角色ID
- */
- @TableField("role_id")
- private Long roleId;
-
-
- public Long getUserId() {
- return userId;
- }
-
- public void setUserId(Long userId) {
- this.userId = userId;
- }
-
- public Long getRoleId() {
- return roleId;
- }
-
- public void setRoleId(Long roleId) {
- this.roleId = roleId;
- }
-
- @Override
- public String toString() {
- return "SysUserRole{" +
- ", userId=" + userId +
- ", roleId=" + roleId +
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/TUser.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/TUser.java
deleted file mode 100644
index 144954f..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/TUser.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package com.ruoyi.management.domain;
-
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.web.domain.BaseModel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * <p>
- * 用户表
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Data
-@TableName("t_user")
-public class TUser extends BaseModel {
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 用户姓名
- */
- private String name;
- /**
- * 账号
- */
- private String account;
- /**
- * 电话
- */
- private String phone;
- /**
- * 密码
- */
- private String password;
- /**
- * 微信openId
- */
- private String openId;
- /**
- * 生日
- */
- private Date birthday;
- /**
- * 性别1男2女
- */
- private Integer gender;
- /**
- * 用户头像
- */
- private String headImg;
- /**
- * 积分
- */
- private Integer integral;
- /**
- * 状态1正常 2冻结 3删除
- */
- private Integer state;
- /**
- * 添加时间
- */
- private Date insertTime;
- /**
- * 会员到期时间 字段未空 则不是会员
- */
- private Date vipEndTime;
- /**
- * 充值会员时间 续费刷新该字段
- */
- private Date vipPayTime;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getAccount() {
- return account;
- }
-
- public void setAccount(String account) {
- this.account = account;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getOpenId() {
- return openId;
- }
-
- public void setOpenId(String openId) {
- this.openId = openId;
- }
-
- public Date getBirthday() {
- return birthday;
- }
-
- public void setBirthday(Date birthday) {
- this.birthday = birthday;
- }
-
- public Integer getGender() {
- return gender;
- }
-
- public void setGender(Integer gender) {
- this.gender = gender;
- }
-
- public String getHeadImg() {
- return headImg;
- }
-
- public void setHeadImg(String headImg) {
- this.headImg = headImg;
- }
-
-
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Date getInsertTime() {
- return insertTime;
- }
-
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public Date getVipEndTime() {
- return vipEndTime;
- }
-
- public void setVipEndTime(Date vipEndTime) {
- this.vipEndTime = vipEndTime;
- }
-
- public Date getVipPayTime() {
- return vipPayTime;
- }
-
- public void setVipPayTime(Date vipPayTime) {
- this.vipPayTime = vipPayTime;
- }
-
-
-
- @Override
- public String toString() {
- return "TUser{" +
- ", id=" + id +
- ", name=" + name +
- ", account=" + account +
- ", phone=" + phone +
- ", password=" + password +
- ", openId=" + openId +
- ", birthday=" + birthday +
- ", gender=" + gender +
- ", headImg=" + headImg +
- ", integral=" + integral +
- ", state=" + state +
- ", insertTime=" + insertTime +
- ", vipEndTime=" + vipEndTime +
- ", vipPayTime=" + vipPayTime +
-
- "}";
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/TVipOrder.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/TVipOrder.java
deleted file mode 100644
index 71517d7..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/TVipOrder.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.ruoyi.management.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.ruoyi.common.core.web.domain.BaseModel;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 系统设置
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Data
-@TableName("t_vip_order")
-public class TVipOrder extends BaseModel {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id")
- private Integer userId;
- /**
- * 支付金额
- */
- @ApiModelProperty(value = "支付金额")
- private BigDecimal money;
- /**
- * 支付时间
- */
- @ApiModelProperty(value = "支付时间")
- private Date payTime;
- /**
- * 订单状态1未支付2已支付3已退款
- */
- @ApiModelProperty(value = "订单状态1未支付2已支付3已退款")
- private Integer payState;
- /**
- * 退款时间
- */
- @ApiModelProperty(value = "退款时间")
- private Date backTime;
- /**
- * 有效期至
- */
- @ApiModelProperty(value = "有效期至")
- private Date time;
- /**
- * 支付方式 1微信2支付宝
- */
- @ApiModelProperty(value = "支付方式 1微信2支付宝")
- private Integer payType;
-
- /**
- * 内部订单号 退款使用
- */
- private String outTradeNo;
- /**
- * 外部订单号 退款使用
- */
- private String transactionId;
- /**
- * 增加会员有效期 单位月
- */
- private Integer count;
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysDeptMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysDeptMapper.java
deleted file mode 100644
index 66e6f3e..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysDeptMapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.management.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.management.domain.SysDept;
-import com.ruoyi.management.dto.DeptQuery;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 部门表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysDeptMapper extends BaseMapper<SysDept> {
- List<SysDept> getList(@Param("req") DeptQuery req);
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysDictDataMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysDictDataMapper.java
deleted file mode 100644
index 7708867..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysDictDataMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysDictData;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 字典数据表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysDictDataMapper extends BaseMapper<SysDictData> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysDictMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysDictMapper.java
deleted file mode 100644
index eaf0ed6..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysDictMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysDict;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 字典表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysDictMapper extends BaseMapper<SysDict> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysDictTypeMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysDictTypeMapper.java
deleted file mode 100644
index e494a8c..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysDictTypeMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysDictType;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 字典类型表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysExpenseMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysExpenseMapper.java
deleted file mode 100644
index e108954..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysExpenseMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysExpense;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 报销表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysExpenseMapper extends BaseMapper<SysExpense> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysJobLogMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysJobLogMapper.java
deleted file mode 100644
index 1c55a29..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysJobLogMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysJobLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 定时任务调度日志表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysJobLogMapper extends BaseMapper<SysJobLog> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysJobMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysJobMapper.java
deleted file mode 100644
index 0201b58..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysJobMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysJob;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 定时任务调度表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysJobMapper extends BaseMapper<SysJob> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysLoginLogMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysLoginLogMapper.java
deleted file mode 100644
index c02e8ea..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysLoginLogMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysLoginLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 登录记录 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysLoginLogMapper extends BaseMapper<SysLoginLog> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysLogininforMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysLogininforMapper.java
deleted file mode 100644
index 6882b1f..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysLogininforMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysLogininfor;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 系统访问记录 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysLogininforMapper extends BaseMapper<SysLogininfor> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysMenuMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysMenuMapper.java
deleted file mode 100644
index 4235248..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysMenuMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysMenu;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 菜单权限表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysMenuMapper extends BaseMapper<SysMenu> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysNoticeMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysNoticeMapper.java
deleted file mode 100644
index 03f7aa7..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysNoticeMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysNotice;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 通知公告表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysNoticeMapper extends BaseMapper<SysNotice> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysOperationLogMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysOperationLogMapper.java
deleted file mode 100644
index 680289e..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysOperationLogMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysOperationLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 操作日志 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysOperationLogMapper extends BaseMapper<SysOperationLog> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysPostMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysPostMapper.java
deleted file mode 100644
index 23fabda..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysPostMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysPost;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 岗位信息表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysPostMapper extends BaseMapper<SysPost> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysRelationMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysRelationMapper.java
deleted file mode 100644
index 7980d28..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysRelationMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysRelation;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 角色和菜单关联表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysRelationMapper extends BaseMapper<SysRelation> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysRoleDeptMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysRoleDeptMapper.java
deleted file mode 100644
index 86d7d6f..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysRoleDeptMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysRoleDept;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 角色和部门关联表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysRoleMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysRoleMapper.java
deleted file mode 100644
index dd97159..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysRoleMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysRole;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 角色信息表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysRoleMapper extends BaseMapper<SysRole> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysRoleMenuMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysRoleMenuMapper.java
deleted file mode 100644
index 1668503..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysRoleMenuMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysRoleMenu;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 角色和菜单关联表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysUserMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysUserMapper.java
deleted file mode 100644
index 047e813..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysUserMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 用户信息表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysUserMapper extends BaseMapper<SysUser> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysUserPostMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysUserPostMapper.java
deleted file mode 100644
index 1f7eb19..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysUserPostMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysUserPost;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 用户与岗位关联表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysUserPostMapper extends BaseMapper<SysUserPost> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysUserRoleMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysUserRoleMapper.java
deleted file mode 100644
index 966d059..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SysUserRoleMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.SysUserRole;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 用户和角色关联表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TGoodsMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TGoodsMapper.java
deleted file mode 100644
index 5b8ae95..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TGoodsMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.goods.api.domain.TGoods;
-
-/**
- * <p>
- * 商品表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface TGoodsMapper extends BaseMapper<TGoods> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TGoodsTypeMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TGoodsTypeMapper.java
deleted file mode 100644
index c996650..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TGoodsTypeMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.goods.api.domain.TGoodsType;
-
-/**
- * <p>
- * 商品类型表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface TGoodsTypeMapper extends BaseMapper<TGoodsType> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TOrderMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TOrderMapper.java
deleted file mode 100644
index a3e6348..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TOrderMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.goods.api.domain.TOrder;
-import com.ruoyi.goods.api.model.OrderQuery;
-import com.ruoyi.goods.api.model.TOrderVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 订单 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface TOrderMapper extends BaseMapper<TOrder> {
-
-
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TUserMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TUserMapper.java
deleted file mode 100644
index 398c3f6..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TUserMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ruoyi.management.mapper;
-
-import com.ruoyi.management.domain.TUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.study.api.dto.AppUserQuery;
-import com.ruoyi.study.api.vo.AppUserVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 用户表 Mapper 接口
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface TUserMapper extends BaseMapper<TUser> {
-
-// List<AppUserVO> listAll(@Param("req") AppUserQuery query);
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysDeptService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysDeptService.java
deleted file mode 100644
index 7dc1f9b..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysDeptService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysDept;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.management.dto.DeptQuery;
-
-import java.util.List;
-
-/**
- * <p>
- * 部门表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysDeptService extends IService<SysDept> {
- List<SysDept> getList(DeptQuery req);
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysDictDataService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysDictDataService.java
deleted file mode 100644
index 7c6a350..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysDictDataService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysDictData;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 字典数据表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysDictDataService extends IService<SysDictData> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysDictService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysDictService.java
deleted file mode 100644
index 3b988fb..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysDictService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysDict;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 字典表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysDictService extends IService<SysDict> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysDictTypeService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysDictTypeService.java
deleted file mode 100644
index cea280b..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysDictTypeService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysDictType;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 字典类型表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysDictTypeService extends IService<SysDictType> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysExpenseService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysExpenseService.java
deleted file mode 100644
index e208dea..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysExpenseService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysExpense;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 报销表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysExpenseService extends IService<SysExpense> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysJobLogService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysJobLogService.java
deleted file mode 100644
index a7eae40..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysJobLogService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysJobLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 定时任务调度日志表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysJobLogService extends IService<SysJobLog> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysJobService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysJobService.java
deleted file mode 100644
index ac6001c..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysJobService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysJob;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 定时任务调度表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysJobService extends IService<SysJob> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysLoginLogService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysLoginLogService.java
deleted file mode 100644
index 17820c1..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysLoginLogService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysLoginLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 登录记录 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysLoginLogService extends IService<SysLoginLog> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysLogininforService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysLogininforService.java
deleted file mode 100644
index 21d9cec..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysLogininforService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysLogininfor;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 系统访问记录 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysLogininforService extends IService<SysLogininfor> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysMenuService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysMenuService.java
deleted file mode 100644
index d386475..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysMenuService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysMenu;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 菜单权限表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysMenuService extends IService<SysMenu> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysNoticeService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysNoticeService.java
deleted file mode 100644
index 0a57678..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysNoticeService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysNotice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 通知公告表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysNoticeService extends IService<SysNotice> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysOperationLogService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysOperationLogService.java
deleted file mode 100644
index de8eee2..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysOperationLogService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysOperationLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 操作日志 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysOperationLogService extends IService<SysOperationLog> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysPostService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysPostService.java
deleted file mode 100644
index 4d74c41..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysPostService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysPost;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 岗位信息表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysPostService extends IService<SysPost> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysRelationService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysRelationService.java
deleted file mode 100644
index 93b6f94..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysRelationService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysRelation;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 角色和菜单关联表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysRelationService extends IService<SysRelation> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysRoleDeptService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysRoleDeptService.java
deleted file mode 100644
index 536f017..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysRoleDeptService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysRoleDept;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 角色和部门关联表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysRoleDeptService extends IService<SysRoleDept> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysRoleMenuService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysRoleMenuService.java
deleted file mode 100644
index c9ecf2e..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysRoleMenuService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysRoleMenu;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 角色和菜单关联表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysRoleMenuService extends IService<SysRoleMenu> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysRoleService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysRoleService.java
deleted file mode 100644
index c59463e..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysRoleService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysRole;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 角色信息表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysRoleService extends IService<SysRole> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysUserPostService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysUserPostService.java
deleted file mode 100644
index ba01721..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysUserPostService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysUserPost;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 用户与岗位关联表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysUserPostService extends IService<SysUserPost> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysUserRoleService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysUserRoleService.java
deleted file mode 100644
index 3c7a0d5..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysUserRoleService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysUserRole;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 用户和角色关联表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysUserRoleService extends IService<SysUserRole> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysUserService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysUserService.java
deleted file mode 100644
index b042522..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ISysUserService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.SysUser;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 用户信息表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ISysUserService extends IService<SysUser> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITGoodsService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITGoodsService.java
deleted file mode 100644
index 836e9c6..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITGoodsService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.goods.api.domain.TGoods;
-
-/**
- * <p>
- * 商品表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ITGoodsService extends IService<TGoods> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITGoodsTypeService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITGoodsTypeService.java
deleted file mode 100644
index 06f9a11..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITGoodsTypeService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.goods.api.domain.TGoodsType;
-
-/**
- * <p>
- * 商品类型表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ITGoodsTypeService extends IService<TGoodsType> {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITOrderService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITOrderService.java
deleted file mode 100644
index da8417c..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITOrderService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.goods.api.domain.TOrder;
-import com.ruoyi.goods.api.model.OrderQuery;
-import com.ruoyi.goods.api.model.TOrderVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 订单 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ITOrderService extends IService<TOrder> {
-
-
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITUserService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITUserService.java
deleted file mode 100644
index 7ccaa8d..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITUserService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.management.service;
-
-import com.ruoyi.management.domain.TUser;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 用户表 服务类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-public interface ITUserService extends IService<TUser> {
-
-// List<AppUserVO> listAll(AppUserQuery query);
- Boolean phoneCode(String phone) throws Exception;
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITVipSetService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITVipSetService.java
index cc24aae..016837c 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITVipSetService.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITVipSetService.java
@@ -12,5 +12,5 @@
* @since 2024-04-26
*/
public interface ITVipSetService extends IService<TVipSet> {
-
+ Boolean phoneCode(String phone) throws Exception;
}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysDeptServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysDeptServiceImpl.java
deleted file mode 100644
index 7f06bdf..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysDeptServiceImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysDept;
-import com.ruoyi.management.dto.DeptQuery;
-import com.ruoyi.management.mapper.SysDeptMapper;
-import com.ruoyi.management.service.ISysDeptService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 部门表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> implements ISysDeptService {
- @Override
- public List<SysDept> getList(DeptQuery req) {
- return this.baseMapper.getList(req);
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysDictDataServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysDictDataServiceImpl.java
deleted file mode 100644
index 053c0bd..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysDictDataServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysDictData;
-import com.ruoyi.management.mapper.SysDictDataMapper;
-import com.ruoyi.management.service.ISysDictDataService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 字典数据表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDictData> implements ISysDictDataService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysDictServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysDictServiceImpl.java
deleted file mode 100644
index 958b80a..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysDictServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysDict;
-import com.ruoyi.management.mapper.SysDictMapper;
-import com.ruoyi.management.service.ISysDictService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 字典表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements ISysDictService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysDictTypeServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysDictTypeServiceImpl.java
deleted file mode 100644
index 9f2005a..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysDictTypeServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysDictType;
-import com.ruoyi.management.mapper.SysDictTypeMapper;
-import com.ruoyi.management.service.ISysDictTypeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 字典类型表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysExpenseServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysExpenseServiceImpl.java
deleted file mode 100644
index b8f5cb1..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysExpenseServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysExpense;
-import com.ruoyi.management.mapper.SysExpenseMapper;
-import com.ruoyi.management.service.ISysExpenseService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 报销表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysExpenseServiceImpl extends ServiceImpl<SysExpenseMapper, SysExpense> implements ISysExpenseService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysJobLogServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysJobLogServiceImpl.java
deleted file mode 100644
index 1eee570..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysJobLogServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysJobLog;
-import com.ruoyi.management.mapper.SysJobLogMapper;
-import com.ruoyi.management.service.ISysJobLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 定时任务调度日志表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysJobLogServiceImpl extends ServiceImpl<SysJobLogMapper, SysJobLog> implements ISysJobLogService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysJobServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysJobServiceImpl.java
deleted file mode 100644
index 963d000..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysJobServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysJob;
-import com.ruoyi.management.mapper.SysJobMapper;
-import com.ruoyi.management.service.ISysJobService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 定时任务调度表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysJobServiceImpl extends ServiceImpl<SysJobMapper, SysJob> implements ISysJobService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysLoginLogServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysLoginLogServiceImpl.java
deleted file mode 100644
index 2c0c5dc..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysLoginLogServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysLoginLog;
-import com.ruoyi.management.mapper.SysLoginLogMapper;
-import com.ruoyi.management.service.ISysLoginLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 登录记录 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysLoginLogServiceImpl extends ServiceImpl<SysLoginLogMapper, SysLoginLog> implements ISysLoginLogService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysLogininforServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysLogininforServiceImpl.java
deleted file mode 100644
index baf5b47..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysLogininforServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysLogininfor;
-import com.ruoyi.management.mapper.SysLogininforMapper;
-import com.ruoyi.management.service.ISysLogininforService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 系统访问记录 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, SysLogininfor> implements ISysLogininforService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysMenuServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysMenuServiceImpl.java
deleted file mode 100644
index d2136b6..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysMenuServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysMenu;
-import com.ruoyi.management.mapper.SysMenuMapper;
-import com.ruoyi.management.service.ISysMenuService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 菜单权限表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements ISysMenuService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysNoticeServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysNoticeServiceImpl.java
deleted file mode 100644
index ca45af2..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysNoticeServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysNotice;
-import com.ruoyi.management.mapper.SysNoticeMapper;
-import com.ruoyi.management.service.ISysNoticeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 通知公告表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysOperationLogServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysOperationLogServiceImpl.java
deleted file mode 100644
index c763fc0..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysOperationLogServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysOperationLog;
-import com.ruoyi.management.mapper.SysOperationLogMapper;
-import com.ruoyi.management.service.ISysOperationLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 操作日志 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysOperationLogServiceImpl extends ServiceImpl<SysOperationLogMapper, SysOperationLog> implements ISysOperationLogService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysPostServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysPostServiceImpl.java
deleted file mode 100644
index 1a57703..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysPostServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysPost;
-import com.ruoyi.management.mapper.SysPostMapper;
-import com.ruoyi.management.service.ISysPostService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 岗位信息表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPost> implements ISysPostService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysRelationServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysRelationServiceImpl.java
deleted file mode 100644
index 10f3ca1..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysRelationServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysRelation;
-import com.ruoyi.management.mapper.SysRelationMapper;
-import com.ruoyi.management.service.ISysRelationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 角色和菜单关联表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysRelationServiceImpl extends ServiceImpl<SysRelationMapper, SysRelation> implements ISysRelationService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysRoleDeptServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysRoleDeptServiceImpl.java
deleted file mode 100644
index d232020..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysRoleDeptServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysRoleDept;
-import com.ruoyi.management.mapper.SysRoleDeptMapper;
-import com.ruoyi.management.service.ISysRoleDeptService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 角色和部门关联表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysRoleDeptServiceImpl extends ServiceImpl<SysRoleDeptMapper, SysRoleDept> implements ISysRoleDeptService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysRoleMenuServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysRoleMenuServiceImpl.java
deleted file mode 100644
index 88671d4..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysRoleMenuServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysRoleMenu;
-import com.ruoyi.management.mapper.SysRoleMenuMapper;
-import com.ruoyi.management.service.ISysRoleMenuService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 角色和菜单关联表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRoleMenu> implements ISysRoleMenuService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysRoleServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysRoleServiceImpl.java
deleted file mode 100644
index a48a647..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysRoleServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysRole;
-import com.ruoyi.management.mapper.SysRoleMapper;
-import com.ruoyi.management.service.ISysRoleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 角色信息表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysUserPostServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysUserPostServiceImpl.java
deleted file mode 100644
index 9adb839..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysUserPostServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysUserPost;
-import com.ruoyi.management.mapper.SysUserPostMapper;
-import com.ruoyi.management.service.ISysUserPostService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 用户与岗位关联表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysUserPostServiceImpl extends ServiceImpl<SysUserPostMapper, SysUserPost> implements ISysUserPostService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysUserRoleServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysUserRoleServiceImpl.java
deleted file mode 100644
index 75b6da7..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysUserRoleServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysUserRole;
-import com.ruoyi.management.mapper.SysUserRoleMapper;
-import com.ruoyi.management.service.ISysUserRoleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 用户和角色关联表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysUserServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysUserServiceImpl.java
deleted file mode 100644
index 11e39a3..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SysUserServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.ruoyi.management.domain.SysUser;
-import com.ruoyi.management.mapper.SysUserMapper;
-import com.ruoyi.management.service.ISysUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 用户信息表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TGoodsServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TGoodsServiceImpl.java
deleted file mode 100644
index 733c9a2..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TGoodsServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.goods.api.domain.TGoods;
-import com.ruoyi.management.mapper.TGoodsMapper;
-import com.ruoyi.management.service.ITGoodsService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 商品表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class TGoodsServiceImpl extends ServiceImpl<TGoodsMapper, TGoods> implements ITGoodsService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TGoodsTypeServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TGoodsTypeServiceImpl.java
deleted file mode 100644
index 7732112..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TGoodsTypeServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.goods.api.domain.TGoodsType;
-import com.ruoyi.management.mapper.TGoodsTypeMapper;
-import com.ruoyi.management.service.ITGoodsTypeService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 商品类型表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class TGoodsTypeServiceImpl extends ServiceImpl<TGoodsTypeMapper, TGoodsType> implements ITGoodsTypeService {
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TOrderServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TOrderServiceImpl.java
deleted file mode 100644
index 67fd822..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TOrderServiceImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.goods.api.domain.TOrder;
-import com.ruoyi.goods.api.model.OrderQuery;
-import com.ruoyi.goods.api.model.TOrderVO;
-import com.ruoyi.management.mapper.TOrderMapper;
-import com.ruoyi.management.service.ITOrderService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 订单 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> implements ITOrderService {
-
-
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TUserServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TUserServiceImpl.java
deleted file mode 100644
index bb606be..0000000
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TUserServiceImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.ruoyi.management.service.impl;
-
-import cn.hutool.core.util.RandomUtil;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.constant.RedisConstants;
-import com.ruoyi.common.core.exception.GlobalException;
-import com.ruoyi.management.domain.TUser;
-import com.ruoyi.management.mapper.TUserMapper;
-import com.ruoyi.management.service.ITUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.management.utils.HWSendSms;
-import com.ruoyi.study.api.dto.AppUserQuery;
-import com.ruoyi.study.api.vo.AppUserVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-/**
- * <p>
- * 用户表 服务实现类
- * </p>
- *
- * @author 无关风月
- * @since 2024-04-26
- */
-@Service
-public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements ITUserService {
- @Resource
- private RedisTemplate<String, Object> redisTemplate;
-// @Override
-// public List<AppUserVO> listAll(AppUserQuery query) {
-// return this.baseMapper.listAll(query);
-// }
-@Autowired
-private HWSendSms hwSendSms;
- @Override
- public Boolean phoneCode(String phone) throws Exception {
- // 生成随机 6位数字 验证码
- String phoneCode = RandomUtil.randomNumbers(6);
-
- hwSendSms.sendSms(phoneCode, phone);
- // 判断redis中是否存在手机验证码
- Object phoneCodeRedis = redisTemplate.opsForValue().get(RedisConstants.PHONE_CODE + phone);
- if (phoneCodeRedis == null) {
- // 将手机验证码 key: reg:用户输入的手机号码 value: 随机验证码:时间戳
- phoneCodeRedis = phoneCode;
- } else {
- // redis有验证码，获取redis中value的时间戳，判断是否过期
- long oldTime = Long.parseLong(String.valueOf(phoneCodeRedis).split(":")[1]);
- // 没有超过1分钟的重发时间
- if (System.currentTimeMillis() - oldTime < (long) Constants.SIXTY * Constants.ONE_THOUSAND) {
- throw new GlobalException("操作频繁，稍后重试!!!");
- } else {
- phoneCode = String.valueOf(phoneCodeRedis).split(":")[0];
- }
- }
- /*
- * 保存信息到redis
- * key为 --> phone_code:手机号码 (phone_code表示该业务为 验证码登录)
- * value为 --> 随机验证码:时间戳 (时间戳用于计算是否超过1分钟的重发时间)
- */
- redisTemplate.opsForValue().set(RedisConstants.PHONE_CODE + phone, phoneCode + ":" + System.currentTimeMillis(), 5, TimeUnit.MINUTES);
- String sendMessage = "验证码发送成功，您的验证码为：" + phoneCode + "，该验证码三分钟内有效，请及时完成登陆";
- // todo 发送此消息
- System.out.println(sendMessage);
- return true;
- }
-}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TVipSetServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TVipSetServiceImpl.java
index ce74e20..11366e9 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TVipSetServiceImpl.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TVipSetServiceImpl.java
@@ -1,10 +1,20 @@
package com.ruoyi.management.service.impl;
+import cn.hutool.core.util.RandomUtil;
+import com.ruoyi.common.core.constant.Constants;
+import com.ruoyi.common.core.constant.RedisConstants;
+import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.management.domain.TVipSet;
import com.ruoyi.management.mapper.TVipSetMapper;
import com.ruoyi.management.service.ITVipSetService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.management.utils.HWSendSms;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.concurrent.TimeUnit;
/**
* <p>
@@ -16,5 +26,44 @@
*/
@Service
public class TVipSetServiceImpl extends ServiceImpl<TVipSetMapper, TVipSet> implements ITVipSetService {
+ @Resource
+ private RedisTemplate<String, Object> redisTemplate;
+ // @Override
+// public List<AppUserVO> listAll(AppUserQuery query) {
+// return this.baseMapper.listAll(query);
+// }
+ @Autowired
+ private HWSendSms hwSendSms;
+ @Override
+ public Boolean phoneCode(String phone) throws Exception {
+ // 生成随机 6位数字 验证码
+ String phoneCode = RandomUtil.randomNumbers(6);
+ hwSendSms.sendSms(phoneCode, phone);
+ // 判断redis中是否存在手机验证码
+ Object phoneCodeRedis = redisTemplate.opsForValue().get(RedisConstants.PHONE_CODE + phone);
+ if (phoneCodeRedis == null) {
+ // 将手机验证码 key: reg:用户输入的手机号码 value: 随机验证码:时间戳
+ phoneCodeRedis = phoneCode;
+ } else {
+ // redis有验证码，获取redis中value的时间戳，判断是否过期
+ long oldTime = Long.parseLong(String.valueOf(phoneCodeRedis).split(":")[1]);
+ // 没有超过1分钟的重发时间
+ if (System.currentTimeMillis() - oldTime < (long) Constants.SIXTY * Constants.ONE_THOUSAND) {
+ throw new GlobalException("操作频繁，稍后重试!!!");
+ } else {
+ phoneCode = String.valueOf(phoneCodeRedis).split(":")[0];
+ }
+ }
+ /*
+ * 保存信息到redis
+ * key为 --> phone_code:手机号码 (phone_code表示该业务为 验证码登录)
+ * value为 --> 随机验证码:时间戳 (时间戳用于计算是否超过1分钟的重发时间)
+ */
+ redisTemplate.opsForValue().set(RedisConstants.PHONE_CODE + phone, phoneCode + ":" + System.currentTimeMillis(), 5, TimeUnit.MINUTES);
+ String sendMessage = "验证码发送成功，您的验证码为：" + phoneCode + "，该验证码三分钟内有效，请及时完成登陆";
+ // todo 发送此消息
+ System.out.println(sendMessage);
+ return true;
+ }
}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/FeedbackVO.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/FeedbackVO.java
index 9533d02..595abfd 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/FeedbackVO.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/FeedbackVO.java
@@ -10,8 +10,10 @@
@Data
@ApiModel
public class FeedbackVO {
- @ApiModelProperty(value = "用户id")
+ @ApiModelProperty(value = "id")
private Integer id;
+ @ApiModelProperty(value = "用户id")
+ private Integer userId;
@ApiModelProperty(value = "用户姓名")
private String name;
@ApiModelProperty(value = "电话")
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysDeptMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysDeptMapper.xml
deleted file mode 100644
index 18739dc..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysDeptMapper.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysDeptMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysDept">
- <id column="dept_id" property="deptId" />
- <result column="parent_id" property="parentId" />
- <result column="ancestors" property="ancestors" />
- <result column="dept_name" property="deptName" />
- <result column="order_num" property="orderNum" />
- <result column="leader" property="leader" />
- <result column="phone" property="phone" />
- <result column="email" property="email" />
- <result column="status" property="status" />
- <result column="del_flag" property="delFlag" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- dept_id, parent_id, ancestors, dept_name, order_num, leader, phone, email, status, del_flag, create_by, create_time, update_by, update_time
- </sql>
- <select id="getList" resultType="com.ruoyi.management.domain.SysDept">
- select t1.* from sys_dept t1
- where 1=1
- <if test="null != req.deptName and '' != req.deptName">
- and t1.dept_name like CONCAT('%', #{req.deptName}, '%')
- </if>
- order by t1.create_time desc
- </select>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysDictDataMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysDictDataMapper.xml
deleted file mode 100644
index 0e3a377..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysDictDataMapper.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysDictDataMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysDictData">
- <id column="dict_code" property="dictCode" />
- <result column="dict_sort" property="dictSort" />
- <result column="dict_label" property="dictLabel" />
- <result column="dict_value" property="dictValue" />
- <result column="dict_type" property="dictType" />
- <result column="css_class" property="cssClass" />
- <result column="list_class" property="listClass" />
- <result column="is_default" property="isDefault" />
- <result column="status" property="status" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="remark" property="remark" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysDictMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysDictMapper.xml
deleted file mode 100644
index 03659aa..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysDictMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysDictMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysDict">
- <id column="id" property="id" />
- <result column="num" property="num" />
- <result column="pid" property="pid" />
- <result column="name" property="name" />
- <result column="tips" property="tips" />
- <result column="code" property="code" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, num, pid, name, tips, code
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysDictTypeMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysDictTypeMapper.xml
deleted file mode 100644
index b098ccc..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysDictTypeMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysDictTypeMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysDictType">
- <id column="dict_id" property="dictId" />
- <result column="dict_name" property="dictName" />
- <result column="dict_type" property="dictType" />
- <result column="status" property="status" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="remark" property="remark" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- dict_id, dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysExpenseMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysExpenseMapper.xml
deleted file mode 100644
index 922bc65..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysExpenseMapper.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysExpenseMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysExpense">
- <id column="id" property="id" />
- <result column="money" property="money" />
- <result column="desc" property="desc" />
- <result column="createtime" property="createtime" />
- <result column="state" property="state" />
- <result column="userid" property="userid" />
- <result column="processId" property="processId" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, money, desc, createtime, state, userid, processId
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysJobLogMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysJobLogMapper.xml
deleted file mode 100644
index db4e91f..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysJobLogMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysJobLogMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysJobLog">
- <id column="job_log_id" property="jobLogId" />
- <result column="job_name" property="jobName" />
- <result column="job_group" property="jobGroup" />
- <result column="invoke_target" property="invokeTarget" />
- <result column="job_message" property="jobMessage" />
- <result column="status" property="status" />
- <result column="exception_info" property="exceptionInfo" />
- <result column="create_time" property="createTime" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysJobMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysJobMapper.xml
deleted file mode 100644
index 0890f3f..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysJobMapper.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysJobMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysJob">
- <id column="job_id" property="jobId" />
- <result column="job_name" property="jobName" />
- <result column="job_group" property="jobGroup" />
- <result column="invoke_target" property="invokeTarget" />
- <result column="cron_expression" property="cronExpression" />
- <result column="misfire_policy" property="misfirePolicy" />
- <result column="concurrent" property="concurrent" />
- <result column="status" property="status" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="remark" property="remark" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, update_by, update_time, remark
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysLoginLogMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysLoginLogMapper.xml
deleted file mode 100644
index e76f9d4..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysLoginLogMapper.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysLoginLogMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysLoginLog">
- <id column="id" property="id" />
- <result column="logname" property="logname" />
- <result column="userid" property="userid" />
- <result column="createtime" property="createtime" />
- <result column="succeed" property="succeed" />
- <result column="message" property="message" />
- <result column="ip" property="ip" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, logname, userid, createtime, succeed, message, ip
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysLogininforMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysLogininforMapper.xml
deleted file mode 100644
index dd6dccb..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysLogininforMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysLogininforMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysLogininfor">
- <id column="info_id" property="infoId" />
- <result column="user_name" property="userName" />
- <result column="ipaddr" property="ipaddr" />
- <result column="status" property="status" />
- <result column="msg" property="msg" />
- <result column="access_time" property="accessTime" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- info_id, user_name, ipaddr, status, msg, access_time
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysMenuMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysMenuMapper.xml
deleted file mode 100644
index 53d4fef..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysMenuMapper.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysMenuMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysMenu">
- <id column="menu_id" property="menuId" />
- <result column="menu_name" property="menuName" />
- <result column="parent_id" property="parentId" />
- <result column="order_num" property="orderNum" />
- <result column="path" property="path" />
- <result column="component" property="component" />
- <result column="query" property="query" />
- <result column="is_frame" property="isFrame" />
- <result column="is_cache" property="isCache" />
- <result column="menu_type" property="menuType" />
- <result column="visible" property="visible" />
- <result column="status" property="status" />
- <result column="perms" property="perms" />
- <result column="icon" property="icon" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="remark" property="remark" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- menu_id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysNoticeMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysNoticeMapper.xml
deleted file mode 100644
index 906c41c..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysNoticeMapper.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysNoticeMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysNotice">
- <id column="notice_id" property="noticeId" />
- <result column="notice_title" property="noticeTitle" />
- <result column="notice_type" property="noticeType" />
- <result column="notice_content" property="noticeContent" />
- <result column="status" property="status" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="remark" property="remark" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- notice_id, notice_title, notice_type, notice_content, status, create_by, create_time, update_by, update_time, remark
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysOperationLogMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysOperationLogMapper.xml
deleted file mode 100644
index 1ce7d5d..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysOperationLogMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysOperationLogMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysOperationLog">
- <id column="id" property="id" />
- <result column="logtype" property="logtype" />
- <result column="logname" property="logname" />
- <result column="userid" property="userid" />
- <result column="classname" property="classname" />
- <result column="method" property="method" />
- <result column="createtime" property="createtime" />
- <result column="succeed" property="succeed" />
- <result column="message" property="message" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, logtype, logname, userid, classname, method, createtime, succeed, message
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysPostMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysPostMapper.xml
deleted file mode 100644
index dd6589e..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysPostMapper.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysPostMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysPost">
- <id column="post_id" property="postId" />
- <result column="post_code" property="postCode" />
- <result column="post_name" property="postName" />
- <result column="post_sort" property="postSort" />
- <result column="status" property="status" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="remark" property="remark" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- post_id, post_code, post_name, post_sort, status, create_by, create_time, update_by, update_time, remark
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysRelationMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysRelationMapper.xml
deleted file mode 100644
index d2b295c..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysRelationMapper.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysRelationMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysRelation">
- <id column="id" property="id" />
- <result column="menuid" property="menuid" />
- <result column="roleid" property="roleid" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, menuid, roleid
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysRoleDeptMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysRoleDeptMapper.xml
deleted file mode 100644
index fa44855..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysRoleDeptMapper.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysRoleDeptMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysRoleDept">
- <id column="role_id" property="roleId" />
- <result column="dept_id" property="deptId" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- role_id, dept_id
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysRoleMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysRoleMapper.xml
deleted file mode 100644
index 74fa832..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysRoleMapper.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysRoleMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysRole">
- <id column="role_id" property="roleId" />
- <result column="role_name" property="roleName" />
- <result column="role_key" property="roleKey" />
- <result column="role_sort" property="roleSort" />
- <result column="data_scope" property="dataScope" />
- <result column="menu_check_strictly" property="menuCheckStrictly" />
- <result column="dept_check_strictly" property="deptCheckStrictly" />
- <result column="status" property="status" />
- <result column="del_flag" property="delFlag" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="remark" property="remark" />
- <result column="carDataAuth" property="carDataAuth" />
- <result column="carTrainOperAuth" property="carTrainOperAuth" />
- <result column="contractDataAuth" property="contractDataAuth" />
- <result column="companyId" property="companyId" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- role_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_by, create_time, update_by, update_time, remark, carDataAuth, carTrainOperAuth, contractDataAuth, companyId
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysRoleMenuMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysRoleMenuMapper.xml
deleted file mode 100644
index 0d20ddb..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysRoleMenuMapper.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysRoleMenuMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysRoleMenu">
- <id column="role_id" property="roleId" />
- <result column="menu_id" property="menuId" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- role_id, menu_id
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysUserMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysUserMapper.xml
deleted file mode 100644
index eb8c026..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysUserMapper.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysUserMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysUser">
- <id column="user_id" property="userId" />
- <result column="dept_id" property="deptId" />
- <result column="user_name" property="userName" />
- <result column="nick_name" property="nickName" />
- <result column="user_type" property="userType" />
- <result column="email" property="email" />
- <result column="phonenumber" property="phonenumber" />
- <result column="sex" property="sex" />
- <result column="avatar" property="avatar" />
- <result column="password" property="password" />
- <result column="status" property="status" />
- <result column="del_flag" property="delFlag" />
- <result column="login_ip" property="loginIp" />
- <result column="login_date" property="loginDate" />
- <result column="roleType" property="roleType" />
- <result column="passWordUpdate" property="passWordUpdate" />
- <result column="objectId" property="objectId" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="remark" property="remark" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- user_id, dept_id, user_name, nick_name, user_type, email, phonenumber, sex, avatar, password, status, del_flag, login_ip, login_date, roleType, passWordUpdate, objectId, create_by, create_time, update_by, update_time, remark
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysUserPostMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysUserPostMapper.xml
deleted file mode 100644
index 3f1d9e8..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysUserPostMapper.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysUserPostMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysUserPost">
- <id column="user_id" property="userId" />
- <result column="post_id" property="postId" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- user_id, post_id
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysUserRoleMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysUserRoleMapper.xml
deleted file mode 100644
index 468694c..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/SysUserRoleMapper.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="com.ruoyi.management.mapper.SysUserRoleMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SysUserRole">
- <id column="user_id" property="userId" />
- <result column="role_id" property="roleId" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- user_id, role_id
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TFeedbackMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TFeedbackMapper.xml
index 7ff10fc..1c9b2d1 100644
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TFeedbackMapper.xml
+++ b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TFeedbackMapper.xml
@@ -16,16 +16,10 @@
id, userId, img, content, state
</sql>
<select id="listAll" resultType="com.ruoyi.management.vo.FeedbackVO">
- select t1.*,t2.name as name ,t2.phone as phone,t1.createTime as insertTime
+ select t1.*,t1.createTime as insertTime
from t_feedback t1
- left join t_user t2 on t1.userId = t2.id
where 1=1
- <if test="null != req.userName and '' != req.userName">
- and t2.name like CONCAT('%', #{req.userName}, '%')
- </if>
- <if test="null != req.phone and '' != req.phone">
- and t2.phone like CONCAT('%', #{req.phone}, '%')
- </if>
+
<if test="null != req.state">
and t1.state = #{req.state}
</if>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TGoodsMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TGoodsMapper.xml
deleted file mode 100644
index a94739d..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TGoodsMapper.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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="com.ruoyi.management.mapper.TGoodsMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.goods.api.domain.TGoods">
- <id column="id" property="id" />
- <result column="name" property="name" />
- <result column="price" property="price" />
- <result column="total" property="total" />
- <result column="surplus" property="surplus" />
- <result column="userCount" property="userCount" />
- <result column="typeIds" property="typeIds" />
- <result column="coverImg" property="coverImg" />
- <result column="detailImg" property="detailImg" />
- <result column="detail" property="detail" />
- <result column="isDelete" property="isDelete" />
- <result column="type" property="type" />
- <result column="integral" property="integral" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, name,
- price, total, surplus, userCount, typeIds, coverImg, detailImg, detail, isDelete, type,integral,
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TGoodsTypeMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TGoodsTypeMapper.xml
deleted file mode 100644
index 3303ce3..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TGoodsTypeMapper.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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="com.ruoyi.management.mapper.TGoodsTypeMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.goods.api.domain.TGoodsType">
- <id column="id" property="id" />
- <result column="name" property="name" />
- <result column="isDelete" property="isDelete" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, name, isDelete
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TOrderMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TOrderMapper.xml
deleted file mode 100644
index 061153b..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TOrderMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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="com.ruoyi.management.mapper.TOrderMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.goods.api.domain.TOrder">
- <id column="id" property="id" />
- <result column="orderNumber" property="orderNumber" />
- <result column="userId" property="userId" />
- <result column="insertTime" property="insertTime" />
- <result column="goodsId" property="goodsId" />
- <result column="count" property="count" />
- <result column="state" property="state" />
- <result column="express" property="express" />
- <result column="expressNumber" property="expressNumber" />
- <result column="expressTime" property="expressTime" />
- <result column="integral" property="integral" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, orderNumber, userId, insertTime, goodsId, count, state, express, expressNumber, expressTime, integral
- </sql>
-
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TUserMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TUserMapper.xml
deleted file mode 100644
index 26d6e4b..0000000
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/TUserMapper.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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="com.ruoyi.management.mapper.TUserMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.TUser">
- <id column="id" property="id" />
- <result column="name" property="name" />
- <result column="account" property="account" />
- <result column="phone" property="phone" />
- <result column="password" property="password" />
- <result column="openId" property="openId" />
- <result column="birthday" property="birthday" />
- <result column="gender" property="gender" />
- <result column="headImg" property="headImg" />
- <result column="integral" property="integral" />
- <result column="state" property="state" />
- <result column="insertTime" property="insertTime" />
- <result column="vipEndTime" property="vipEndTime" />
- <result column="vipPayTime" property="vipPayTime" />
-
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, name, account, phone, password, openId, birthday, gender, headImg, integral, state, insertTime, vipEndTime, vipPayTime, isBack, backTime
- </sql>
-
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-study/pom.xml b/ruoyi-service/ruoyi-study/pom.xml
index c81b75a..6eda3a5 100644
--- a/ruoyi-service/ruoyi-study/pom.xml
+++ b/ruoyi-service/ruoyi-study/pom.xml
@@ -16,6 +16,12 @@
<dependencies>
+ <!--依赖sharding-jdbc-->
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-jdbc-core</artifactId>
+ <version>5.2.0</version>
+ </dependency>
<dependency>
<groupId>org.openeuler</groupId>
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/RuoYiStudyApplication.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/RuoYiStudyApplication.java
index 5771992..71f4e8a 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/RuoYiStudyApplication.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/RuoYiStudyApplication.java
@@ -9,6 +9,7 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.scheduling.annotation.EnableScheduling;
/**
@@ -38,5 +39,10 @@
" | | \\ / \\ / \n" +
" ''-' `'-' `-..-' ");
}
-
+ @Bean
+ public static PropertySourcesPlaceholderConfigurer placeholderConfigurer() {
+ PropertySourcesPlaceholderConfigurer c = new PropertySourcesPlaceholderConfigurer();
+ c.setIgnoreUnresolvablePlaceholders(true);
+ return c;
+ }
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java
new file mode 100644
index 0000000..ce13d8a
--- /dev/null
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java
@@ -0,0 +1,24 @@
+package com.ruoyi.study.config;
+
+
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
+/**
+ * 数据源
+ *
+ * @author pzb
+ * @Date 2022/11/21 21:13
+ */
+@Data
+@Component
+public class DatasourceModel {
+ private String url = "jdbc:mysql://127.0.0.1:10633/dolphin_study?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai";
+ private String username = "root";
+ private String password = "HaiTunEnglish2024!";
+ private String driverClassName = "com.mysql.cj.jdbc.Driver";
+ private Integer maxActive =20;
+ private Long maxWait = 60000L;
+ private Integer minIdle =5;
+ private Integer initialSize =2;
+}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/Master0DataSource.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/Master0DataSource.java
new file mode 100644
index 0000000..8b36528
--- /dev/null
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/Master0DataSource.java
@@ -0,0 +1,8 @@
+package com.ruoyi.study.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+
+
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/ShardingConfig.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/ShardingConfig.java
new file mode 100644
index 0000000..d763ffe
--- /dev/null
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/ShardingConfig.java
@@ -0,0 +1,172 @@
+package com.ruoyi.study.config;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import org.apache.shardingsphere.driver.api.ShardingSphereDataSourceFactory;
+import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
+import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration;
+import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.sql.DataSource;
+import java.sql.SQLException;
+import java.util.*;
+
+@Configuration
+public class ShardingConfig {
+
+ @Autowired
+ private DatasourceModel master0DataSource;
+
+
+ @Bean
+ public DataSource getDataSource() {
+ DataSource dataSource = null;
+ try {
+ Properties properties = new Properties();
+ properties.setProperty("sql-show", "true");
+ String databaseName = "m_0";//真实数据源名称，多个数据源用逗号区分
+ dataSource = ShardingSphereDataSourceFactory.createDataSource(databaseName, createDataSourceMap(), createShardingRuleConfiguration(), properties);
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ return dataSource;
+ }
+
+
+ /**
+ * 配置多数据源
+ *
+ * @return
+ */
+ private Map<String, DataSource> createDataSourceMap() {
+ Map<String, DataSource> dataSourceMap = new HashMap<>();
+ // 配置第 1 个数据源
+ DruidDataSource dataSource1 = new DruidDataSource();
+ dataSource1.setDriverClassName(master0DataSource.getDriverClassName());
+ dataSource1.setUrl(master0DataSource.getUrl());
+ dataSource1.setUsername(master0DataSource.getUsername());
+ dataSource1.setPassword(master0DataSource.getPassword());
+ dataSource1.setMaxActive(master0DataSource.getMaxActive());
+ dataSource1.setMaxWait(master0DataSource.getMaxWait());
+ dataSource1.setMinIdle(master0DataSource.getMinIdle());
+ dataSource1.setInitialSize(master0DataSource.getInitialSize());
+ dataSourceMap.put("m_0", dataSource1);
+ return dataSourceMap;
+ }
+
+
+ /**
+ * 分片配置
+ *
+ * @return
+ */
+ private Collection<RuleConfiguration> createShardingRuleConfiguration() {
+ LinkedList<RuleConfiguration> linkedList = new LinkedList();
+
+ //分片规则配置
+ ShardingRuleConfiguration result1 = new ShardingRuleConfiguration();
+
+ result1.getTables().add(getCoursePackagePaymentTableRuleConfiguration());
+ Properties props1 = new Properties();
+ props1.setProperty("algorithm-expression", "t_integral_record$->{userId % 5 + 1}");
+ result1.getShardingAlgorithms().put("t_integral_record-inline", new AlgorithmConfiguration("INLINE", props1));
+ result1.getKeyGenerators().put("t_integral_record-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
+
+ //分片规则配置
+ result1.getTables().add(getCoursePackageStudentTableRuleConfiguration());
+ Properties props2 = new Properties();
+ props2.setProperty("algorithm-expression", "t_game_record$->{userId % 5 + 1}");
+ result1.getShardingAlgorithms().put("t_game_record-inline", new AlgorithmConfiguration("INLINE", props2));
+ result1.getKeyGenerators().put("t_game_record-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
+
+
+ //分片规则配置
+ result1.getTables().add(getCoursePackageSchedulingTableRuleConfiguration());
+ Properties props5 = new Properties();
+ props5.setProperty("algorithm-expression", "t_user_study_record$->{user_id % 5 + 1}");
+ result1.getShardingAlgorithms().put("t_user_study_record-inline", new AlgorithmConfiguration("INLINE", props5));
+ result1.getKeyGenerators().put("t_user_study_record-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
+
+ //分片规则配置
+ result1.getTables().add(getCoursePackageOrderTableRuleConfiguration());
+ Properties props6 = new Properties();
+ props6.setProperty("algorithm-expression", "t_subject_record$->{userId % 5 + 1}");
+ result1.getShardingAlgorithms().put("t_subject_record-inline", new AlgorithmConfiguration("INLINE", props6));
+ result1.getKeyGenerators().put("t_subject_record-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
+ //分片规则配置
+ result1.getTables().add(getCoursePackageOrderTableRuleConfiguration1());
+ Properties props7 = new Properties();
+ props7.setProperty("algorithm-expression", "t_user_present_record$->{user_id % 5 + 1}");
+ result1.getShardingAlgorithms().put("t_user_present_record-inline", new AlgorithmConfiguration("INLINE", props7));
+ result1.getKeyGenerators().put("t_user_present_record-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
+
+ linkedList.add(result1);
+ return linkedList;
+ }
+
+ /**
+ * 分片算法配置
+ *
+ * @return
+ */
+ private ShardingTableRuleConfiguration getCoursePackagePaymentTableRuleConfiguration() {
+ ShardingTableRuleConfiguration result = new ShardingTableRuleConfiguration("t_integral_record", "m_$->{0}.t_integral_record$->{1..5}");//50
+ result.setTableShardingStrategy(new StandardShardingStrategyConfiguration("userId", "t_integral_record-inline"));
+ result.setKeyGenerateStrategy(new KeyGenerateStrategyConfiguration("id", "t_integral_record-snowflake"));
+ return result;
+ }
+
+
+ /**
+ * 分片算法配置
+ *
+ * @return
+ */
+ private ShardingTableRuleConfiguration getCoursePackageStudentTableRuleConfiguration() {
+ ShardingTableRuleConfiguration result = new ShardingTableRuleConfiguration("t_game_record", "m_$->{0}.t_game_record$->{1..5}");//30
+ result.setTableShardingStrategy(new StandardShardingStrategyConfiguration("userId", "t_game_record-inline"));
+ result.setKeyGenerateStrategy(new KeyGenerateStrategyConfiguration("id", "t_game_record-snowflake"));
+ return result;
+ }
+
+
+
+
+
+
+ /**
+ * 分片算法配置
+ *
+ * @return
+ */
+ private ShardingTableRuleConfiguration getCoursePackageSchedulingTableRuleConfiguration() {
+ ShardingTableRuleConfiguration result = new ShardingTableRuleConfiguration("t_user_study_record", "m_$->{0}.t_user_study_record$->{1..5}");//30
+ result.setTableShardingStrategy(new StandardShardingStrategyConfiguration("user_id", "t_user_study_record-inline"));
+ result.setKeyGenerateStrategy(new KeyGenerateStrategyConfiguration("id", "t_user_study_record-snowflake"));
+ return result;
+ }
+
+
+ /**
+ * 分片算法配置
+ *
+ * @return
+ */
+ private ShardingTableRuleConfiguration getCoursePackageOrderTableRuleConfiguration() {
+ ShardingTableRuleConfiguration result = new ShardingTableRuleConfiguration("t_subject_record", "m_$->{0}.t_subject_record$->{1..5}");//30
+ result.setTableShardingStrategy(new StandardShardingStrategyConfiguration("userId", "t_subject_record-inline"));
+ result.setKeyGenerateStrategy(new KeyGenerateStrategyConfiguration("id", "t_subject_record-snowflake"));
+ return result;
+ }private ShardingTableRuleConfiguration getCoursePackageOrderTableRuleConfiguration1() {
+ ShardingTableRuleConfiguration result = new ShardingTableRuleConfiguration("t_user_present_record", "m_$->{0}.t_user_present_record$->{1..5}");//30
+ result.setTableShardingStrategy(new StandardShardingStrategyConfiguration("user_id", "t_user_present_record-inline"));
+ result.setKeyGenerateStrategy(new KeyGenerateStrategyConfiguration("id", "t_user_present_record-snowflake"));
+ return result;
+ }
+
+}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStoryController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStoryController.java
index a8bfdf8..87356f6 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStoryController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStoryController.java
@@ -29,25 +29,7 @@
@RequestMapping("/base/tStory")
public class TStoryController {
@Autowired
- private ITStudyAnswerService studyAnswerService;
- @Autowired
- private ITStudyInductionService studyInductionService;
- @Autowired
- private ITStudyLookService studyLookService;
- @Autowired
- private ITStudyListenService studyListenService;
- @Autowired
- private ITStudyPairService studyPairService;
- @Autowired
- private ITGameService gameService;
- @Autowired
private ITStoryListenService storyListenService;
- @Autowired
- private ITSubjectService subjectService;
- @Autowired
- private ITStoryService storyService;
- @Autowired
- private ITStudyService studyService;
@Autowired
private ITStoryService service;
@PostMapping("/storyList")
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index b2385ee..cce4183 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -1,4 +1,5 @@
package com.ruoyi.study.controller;
+import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -21,6 +22,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.jetbrains.annotations.TestOnly;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -83,6 +85,67 @@
@Resource
private ITUserPresentRecordService userPresentRecordService;
+ @PostMapping("/testAddData")
+ @ApiOperation(value = "测试分片", tags = {"测试分片"})
+ public R<Object> testAddData() {
+ TIntegralRecord tIntegralRecord = new TIntegralRecord();
+ tIntegralRecord.setIntegral("1");
+ tIntegralRecord.setMethod("1");
+ tIntegralRecord.setUserId(23);
+ tIntegralRecord.setGameId(1);
+ tIntegralRecord.setGameDifficulty(1);
+ tIntegralRecord.setStoryId(1);
+ tIntegralRecord.setStoryType(1);
+ integralRecordService.save(tIntegralRecord);
+ TGameRecord tGameRecord = new TGameRecord();
+ tGameRecord.setUserId(33);
+ tGameRecord.setAccuracy(0);
+ tGameRecord.setGameName("");
+ tGameRecord.setUseTime(0);
+ tGameRecord.setUseTime1("");
+ tGameRecord.setGameId(0);
+ tGameRecord.setGameDifficulty(0);
+ tGameRecord.setTime("");
+ tGameRecord.setDisabled(false);
+ tGameRecord.setCreateBy("");
+ tGameRecord.setCreateTime(new Date());
+ tGameRecord.setUpdateBy("");
+ tGameRecord.setUpdateTime(new Date());
+ gameRecordService.save(tGameRecord);
+ TSubjectRecord tSubjectRecord = new TSubjectRecord();
+ tSubjectRecord.setUserId(22);
+ tSubjectRecord.setWeek(0);
+ tSubjectRecord.setDay(0);
+ tSubjectRecord.setBeforeSubject("");
+ tSubjectRecord.setType(0);
+ tSubjectRecord.setCompleteSubject("");
+ tSubjectRecord.setAnswerNumber(0);
+ tSubjectRecord.setCorrectNumber(0);
+ tSubjectRecord.setDisabled(false);
+ tSubjectRecord.setCreateBy("");
+ tSubjectRecord.setCreateTime(new Date());
+ tSubjectRecord.setUpdateBy("");
+ tSubjectRecord.setUpdateTime(new Date());
+ subjectRecordService.save(tSubjectRecord);
+ TUserPresentRecord tUserPresentRecord = new TUserPresentRecord();
+ tUserPresentRecord.setUserId(44);
+ tUserPresentRecord.setPresentTime(new Date());
+ tUserPresentRecord.setIsDelete(0);
+ userPresentRecordService.save(tUserPresentRecord);
+
+ TUserStudyRecord tUserStudyRecord = new TUserStudyRecord();
+ tUserStudyRecord.setUserId(17);
+ tUserStudyRecord.setQuarter(0);
+ tUserStudyRecord.setWeek(0);
+ tUserStudyRecord.setDay(0);
+ tUserStudyRecord.setObtainedIntegral(0);
+ tUserStudyRecord.setType(0);
+ tUserStudyRecord.setStudyType(0);
+ tUserStudyRecord.setStoryId(0);
+ studyRecordService.save(tUserStudyRecord);
+
+ return R.ok();
+ }
@PostMapping("/storyList")
// @ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"})
public R<PageInfo<TStory>> storyList(@RequestBody ChoiceStory query) {
@@ -1769,6 +1832,9 @@
@GetMapping("/getIntegral")
@ApiOperation(value = "获取剩余积分", tags = {"家长端-获取剩余积分"})
public R<Integer> getIntegral() {
+ if (tokenService.getLoginUser1() == null){
+ return R.tokenError("登录失效");
+ }
Integer userId = tokenService.getLoginUser1().getUserid();
return R.ok(userService.getById(userId).getIntegral());
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
index 62e9d8e..2f3a4d1 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
@@ -211,6 +211,10 @@
Map<String, String> map = payMoneyUtil.alipayCallback(request);
System.err.println("返回参数" + map);
if (null != map) {
+ PrintWriter out = response.getWriter();
+ out.write("success");
+ out.flush();
+ out.close();
String out_trade_no = map.get("out_trade_no");
String trade_no = map.get("trade_no");
// 会员规格id
@@ -278,10 +282,7 @@
// 修改用户会员续期信息
userService.updateById(byId1);
- PrintWriter out = response.getWriter();
- out.write("success");
- out.flush();
- out.close();
+
}
} catch (Exception e) {
e.printStackTrace();
@@ -294,11 +295,16 @@
try {
Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
if (null != map) {
+
// 内部订单号
String out_trade_no = map.get("out_trade_no");
// 微信订单号
String transaction_id = map.get("transaction_id");
String result = map.get("result");
+ PrintWriter out = response.getWriter();
+ out.write(result);
+ out.flush();
+ out.close();
// 会员规格id
String s = out_trade_no.split("_")[0];
Integer integer = Integer.valueOf(s);
@@ -359,10 +365,7 @@
vipOrderService.updateById(byId);
// 修改用户会员续期信息
userService.updateById(byId1);
- PrintWriter out = response.getWriter();
- out.write(result);
- out.flush();
- out.close();
+
}
} catch (Exception e) {
e.printStackTrace();
@@ -921,9 +924,14 @@
try {
Map<String, String> map = payMoneyUtil.wxRefundCallback(request);
if (null != map) {
+
String code = map.get("out_refund_no");
String refund_id = map.get("refund_id");
String result = map.get("result");
+ PrintWriter out = response.getWriter();
+ out.write(result);
+ out.flush();
+ out.close();
TVipOrder one = vipOrderService.getOne(new QueryWrapper<TVipOrder>()
.eq("outTradeNo", code)
.eq("payState", 3));
@@ -950,10 +958,7 @@
userService.updateById(byId1);
}
- PrintWriter out = response.getWriter();
- out.write(result);
- out.flush();
- out.close();
+
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGameRecord.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGameRecord.java
index 0c8bc64..db7f9cf 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGameRecord.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGameRecord.java
@@ -25,8 +25,8 @@
/**
* 主键id
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
/**
* 用户id
*/
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java
index 6922031..050bc61 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java
@@ -25,8 +25,8 @@
/**
* 主键id
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
/**
* 积分数量 带有负号为减少
*/
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecord.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecord.java
index b25b255..f42d1aa 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecord.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecord.java
@@ -25,8 +25,8 @@
/**
* 主键id
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
/**
* 用户id
*/
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserPresentRecord.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserPresentRecord.java
index 11b6dc3..aff1a61 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserPresentRecord.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserPresentRecord.java
@@ -22,8 +22,8 @@
@TableName("t_user_present_record")
public class TUserPresentRecord {
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
/**
* 用户id
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserStudyRecord.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserStudyRecord.java
index 785e1dd..d77d922 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserStudyRecord.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TUserStudyRecord.java
@@ -24,8 +24,8 @@
/**
* 主键id
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
/**
* 季度
--
Gitblit v1.7.1