Compare commits
No commits in common. "nsq" and "master" have entirely different histories.
|
|
@ -249,7 +249,7 @@ INSERT INTO `common_info` VALUES (420, '2023-08-28 11:23:02', NULL, '一级佣
|
|||
INSERT INTO `common_info` VALUES (421, '2024-03-05 16:55:37', NULL, '二级佣金比例', 421, '0.04', 'fuwufei');
|
||||
INSERT INTO `common_info` VALUES (450, '2024-02-02 18:12:27', NULL, '剧导入模板', 450, 'https://duanju.xianmxkj.com/剧导入模板.xlsx', 'xitong');
|
||||
INSERT INTO `common_info` VALUES (451, '2024-02-02 18:12:49', NULL, '集导入模板', 451, 'https://duanju.xianmxkj.com/集导入模板.xlsx', 'xitong');
|
||||
INSERT INTO `common_info` VALUES (500, '2020-02-25 20:44:15', NULL, '付费须知说明', 500, '金币一经购买不予退款,未满18岁需在监护人的指导、同意下进行付费操作', 'xieyi');
|
||||
INSERT INTO `common_info` VALUES (500, '2020-02-25 20:44:15', NULL, '付费须知说明', 500, '金豆一经购买不予退款,未满18岁需在监护人的指导、同意下进行付费操作', 'xieyi');
|
||||
INSERT INTO `common_info` VALUES (800, '2024-05-30 18:08:11', NULL, '腾讯云oss AccessKey', 800, '', 'oss');
|
||||
INSERT INTO `common_info` VALUES (801, '2024-05-30 18:08:06', NULL, '腾讯云oss SecretKey', 801, '', 'oss');
|
||||
INSERT INTO `common_info` VALUES (802, '2024-05-30 18:08:17', NULL, '腾讯云oss bucket地域', 802, 'ap-shanghai', 'oss');
|
||||
|
|
@ -274,7 +274,7 @@ INSERT INTO `common_info` VALUES (821, '2024-01-06 11:40:25', NULL, '抖音原
|
|||
INSERT INTO `common_info` VALUES (822, '2024-06-26 16:07:33', NULL, '小程序AppKey', 822, '', 'xitong');
|
||||
INSERT INTO `common_info` VALUES (823, '2024-06-26 16:07:18', NULL, '微信虚拟支付OfferID', 823, '', 'xitong');
|
||||
INSERT INTO `common_info` VALUES (824, '2024-07-08 02:19:39', NULL, '微信虚拟支付环境 0正式环境 1沙盒环境', 824, '0', 'xitong');
|
||||
INSERT INTO `common_info` VALUES (825, '2024-01-06 11:40:25', NULL, '充值提示', 825, '金币一经购买不予退款,未满18岁需在监护人的指导、同意下进行付费操作', 'xitong');
|
||||
INSERT INTO `common_info` VALUES (825, '2024-01-06 11:40:25', NULL, '充值提示', 825, '金豆一经购买不予退款,未满18岁需在监护人的指导、同意下进行付费操作', 'xitong');
|
||||
INSERT INTO `common_info` VALUES (826, '2024-06-26 16:07:54', NULL, '小程序Token', 826, '', 'weixin');
|
||||
INSERT INTO `common_info` VALUES (827, '2024-06-26 16:07:44', NULL, '小程序EncodingAESKey ', 827, '', 'weixin');
|
||||
INSERT INTO `common_info` VALUES (828, '2020-02-25 20:43:59', NULL, '快手AppId', 828, '', 'xitong');
|
||||
|
|
|
|||
164
pom.xml
164
pom.xml
|
|
@ -23,7 +23,7 @@
|
|||
<mssql.version>4.0</mssql.version>
|
||||
<oracle.version>11.2.0.3</oracle.version>
|
||||
<druid.version>1.1.13</druid.version>
|
||||
<!-- <quartz.version>2.3.0</quartz.version>-->
|
||||
<quartz.version>2.3.0</quartz.version>
|
||||
<commons.lang.version>2.6</commons.lang.version>
|
||||
<commons.fileupload.version>1.2.2</commons.fileupload.version>
|
||||
<commons.io.version>2.5</commons.io.version>
|
||||
|
|
@ -35,14 +35,12 @@
|
|||
<qiniu.version>7.2.23</qiniu.version>
|
||||
<aliyun.oss.version>3.4.0</aliyun.oss.version>
|
||||
<qcloud.cos.version>4.4</qcloud.cos.version>
|
||||
<!-- <swagger.version>2.7.0</swagger.version>-->
|
||||
<swagger.version>2.9.2</swagger.version>
|
||||
<swagger.version>2.7.0</swagger.version>
|
||||
<joda.time.version>2.9.9</joda.time.version>
|
||||
<gson.version>2.8.5</gson.version>
|
||||
<fastjson.version>1.2.83</fastjson.version>
|
||||
<hutool.version>4.6.10</hutool.version>
|
||||
<lombok.version>1.18.4</lombok.version>
|
||||
<shardingsphere.version>4.1.1</shardingsphere.version>
|
||||
|
||||
<!--wagon plugin 配置-->
|
||||
<!--<service-path>/work/sz</service-path>
|
||||
|
|
@ -53,26 +51,6 @@
|
|||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.aliyun</groupId>
|
||||
<artifactId>dytnsapi20200217</artifactId>
|
||||
<version>2.9.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.aliyun</groupId>
|
||||
<artifactId>tea-openapi</artifactId>
|
||||
<version>0.3.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.aliyun</groupId>
|
||||
<artifactId>tea-console</artifactId>
|
||||
<version>0.0.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.aliyun</groupId>
|
||||
<artifactId>tea-util</artifactId>
|
||||
<version>0.2.23</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.volcengine</groupId>
|
||||
|
|
@ -85,27 +63,15 @@
|
|||
<artifactId>guava</artifactId>
|
||||
<version>19.0</version>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.amazonaws</groupId>-->
|
||||
<!-- <artifactId>aws-java-sdk</artifactId>-->
|
||||
<!-- <version>1.11.274</version>-->
|
||||
<!-- <exclusions>-->
|
||||
<!-- <exclusion>-->
|
||||
<!-- <artifactId>aws-java-sdk-simpleworkflow</artifactId>-->
|
||||
<!-- <groupId>com.amazonaws</groupId>-->
|
||||
<!-- </exclusion>-->
|
||||
<!-- </exclusions>-->
|
||||
<!-- </dependency>-->
|
||||
<dependency>
|
||||
<groupId>com.amazonaws</groupId>
|
||||
<artifactId>aws-java-sdk</artifactId>
|
||||
<version>1.11.274</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.afterturn</groupId>
|
||||
<artifactId>easypoi-spring-boot-starter</artifactId>
|
||||
<version>4.0.0</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>javassist</artifactId>
|
||||
<groupId>org.javassist</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.github.qcloudsms</groupId>
|
||||
|
|
@ -125,6 +91,13 @@
|
|||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!--云购os支付-->
|
||||
<dependency>
|
||||
<groupId>com.yungouos.pay</groupId>
|
||||
<artifactId>yungouos-pay-sdk</artifactId>
|
||||
<version>2.0.10</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.hibernate.validator</groupId>
|
||||
<artifactId>hibernate-validator</artifactId>
|
||||
|
|
@ -150,11 +123,11 @@
|
|||
<version>5.5.0</version>
|
||||
</dependency>
|
||||
<!-- https://mvnrepository.com/artifact/com.alibaba/druid -->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.alibaba</groupId>-->
|
||||
<!-- <artifactId>druid</artifactId>-->
|
||||
<!-- <version>1.1.10</version>-->
|
||||
<!-- </dependency>-->
|
||||
<dependency>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>druid</artifactId>
|
||||
<version>1.1.10</version>
|
||||
</dependency>
|
||||
<!-- 苹果工具类 -->
|
||||
<dependency>
|
||||
<groupId>com.auth0</groupId>
|
||||
|
|
@ -204,12 +177,6 @@
|
|||
<groupId>com.aliyun.oss</groupId>
|
||||
<artifactId>aliyun-sdk-oss</artifactId>
|
||||
<version>3.4.0</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>aliyun-java-sdk-core</artifactId>
|
||||
<groupId>com.aliyun</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.aliyun</groupId>
|
||||
|
|
@ -274,40 +241,16 @@
|
|||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<!--动态数据库切换-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.baomidou</groupId>-->
|
||||
<!-- <artifactId>dynamic-datasource-spring-boot-starter</artifactId>-->
|
||||
<!-- <version>4.1.3</version>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
<version>${mysql.version}</version>
|
||||
</dependency>
|
||||
<!--oracle驱动-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.oracle</groupId>-->
|
||||
<!-- <artifactId>ojdbc6</artifactId>-->
|
||||
<!-- <version>${oracle.version}</version>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- 用于定义sharding-jdbc 分片规则 -->
|
||||
<dependency>
|
||||
<groupId>org.apache.shardingsphere</groupId>
|
||||
<artifactId>sharding-core-api</artifactId>
|
||||
<version>${shardingsphere.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.shardingsphere</groupId>
|
||||
<artifactId>sharding-jdbc-core</artifactId>
|
||||
<version>${shardingsphere.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||
<groupId>com.oracle</groupId>
|
||||
<artifactId>ojdbc6</artifactId>
|
||||
<version>${oracle.version}</version>
|
||||
</dependency>
|
||||
<!--mssql驱动-->
|
||||
<dependency>
|
||||
|
|
@ -316,26 +259,26 @@
|
|||
<version>${mssql.version}</version>
|
||||
</dependency>
|
||||
<!--postgresql驱动-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.postgresql</groupId>-->
|
||||
<!-- <artifactId>postgresql</artifactId>-->
|
||||
<!-- </dependency>-->
|
||||
<dependency>
|
||||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>druid-spring-boot-starter</artifactId>
|
||||
<version>${druid.version}</version>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.quartz-scheduler</groupId>-->
|
||||
<!-- <artifactId>quartz</artifactId>-->
|
||||
<!-- <version>${quartz.version}</version>-->
|
||||
<!-- <exclusions>-->
|
||||
<!-- <exclusion>-->
|
||||
<!-- <groupId>com.mchange</groupId>-->
|
||||
<!-- <artifactId>c3p0</artifactId>-->
|
||||
<!-- </exclusion>-->
|
||||
<!-- </exclusions>-->
|
||||
<!-- </dependency>-->
|
||||
<dependency>
|
||||
<groupId>org.quartz-scheduler</groupId>
|
||||
<artifactId>quartz</artifactId>
|
||||
<version>${quartz.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>com.mchange</groupId>
|
||||
<artifactId>c3p0</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-lang</groupId>
|
||||
<artifactId>commons-lang</artifactId>
|
||||
|
|
@ -376,27 +319,16 @@
|
|||
<artifactId>kaptcha</artifactId>
|
||||
<version>${kaptcha.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.springfox</groupId>
|
||||
<artifactId>springfox-swagger-ui</artifactId>
|
||||
<version>${swagger.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.springfox</groupId>
|
||||
<artifactId>springfox-swagger2</artifactId>
|
||||
<version>${swagger.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.swagger</groupId>
|
||||
<artifactId>swagger-annotations</artifactId>
|
||||
<version>1.5.22</version>
|
||||
<groupId>io.springfox</groupId>
|
||||
<artifactId>springfox-swagger-ui</artifactId>
|
||||
<version>${swagger.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.swagger</groupId>
|
||||
<artifactId>swagger-models</artifactId>
|
||||
<version>1.5.22</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.qiniu</groupId>
|
||||
<artifactId>qiniu-java-sdk</artifactId>
|
||||
|
|
@ -487,17 +419,11 @@
|
|||
<artifactId>restful-sdk</artifactId>
|
||||
<version>1.0.0.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.sproutsocial</groupId>
|
||||
<artifactId>nsq-j</artifactId>
|
||||
<version>1.4.9</version>
|
||||
</dependency>
|
||||
<!--<dependency>-->
|
||||
<!--<groupId>com.baidu.aip</groupId>-->
|
||||
<!-- <artifactId>java-sdk</artifactId>-->
|
||||
<!-- <version>4.11.3</version>-->
|
||||
<!--</dependency>-->
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
|
|
|||
|
|
@ -1,127 +0,0 @@
|
|||
package com.sqx;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.sqx.modules.app.dao.UserDao;
|
||||
import com.sqx.modules.app.dao.UserMoneyDao;
|
||||
import com.sqx.modules.app.dao.UserMoneyDetailsDao;
|
||||
import com.sqx.modules.app.entity.UserMoney;
|
||||
import com.sqx.modules.app.service.InviteAchievementService;
|
||||
import com.sqx.modules.app.service.UserService;
|
||||
import com.sqx.modules.job.task.TempOrdersTask;
|
||||
import com.sqx.modules.orders.entity.Orders;
|
||||
import com.sqx.modules.orders.service.OrdersService;
|
||||
import com.sqx.modules.pay.dao.CashOutDao;
|
||||
import com.sqx.modules.pay.dao.PayDetailsDao;
|
||||
import com.sqx.modules.pay.entity.CashOut;
|
||||
import com.sqx.modules.pay.entity.PayDetails;
|
||||
import com.sqx.modules.pay.service.PayDetailsService;
|
||||
import com.sqx.modules.pay.wuyou.BaseResp;
|
||||
import com.sqx.modules.pay.wuyou.WuyouPay;
|
||||
import com.sqx.modules.sys.dao.SysUserMoneyDao;
|
||||
import com.sqx.modules.sys.entity.SysUserMoney;
|
||||
import com.sqx.modules.sys.service.SysUserService;
|
||||
import com.sqx.nsq.SubscriberService;
|
||||
import com.sqx.nsq.subscriber.NsqSubscriber;
|
||||
import com.sqx.nsq.subscriber.TestNsqSubscriber;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.context.ApplicationListener;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Component
|
||||
public class OneTimeTaskListener implements ApplicationListener<ApplicationReadyEvent> {
|
||||
|
||||
final ApplicationContext applicationContext;
|
||||
final UserService userService;
|
||||
final TempOrdersTask tempOrdersTask;
|
||||
final InviteAchievementService inviteAchievementService;
|
||||
final PayDetailsService payDetailsService;
|
||||
final PayDetailsDao payDetailsDao;
|
||||
final UserMoneyDetailsDao userMoneyDetailsDao;
|
||||
final UserMoneyDao userMoneyDao;
|
||||
|
||||
private final OrdersService ordersService;
|
||||
private final WuyouPay wuyouPay;
|
||||
private final SysUserMoneyDao sysUserMoneyDao;
|
||||
private Logger logger = LoggerFactory.getLogger(getClass());
|
||||
private final CashOutDao cashOutDao;
|
||||
|
||||
|
||||
@Resource
|
||||
private SubscriberService subscriberService;
|
||||
|
||||
public OneTimeTaskListener(ApplicationContext applicationContext, UserService userService, TempOrdersTask tempOrdersTask, InviteAchievementService inviteAchievementService, PayDetailsService payDetailsService, PayDetailsDao payDetailsDao, UserMoneyDetailsDao userMoneyDetailsDao, UserMoneyDao userMoneyDao, OrdersService ordersService, WuyouPay wuyouPay, CashOutDao cashOutDao, SysUserMoneyDao sysUserMoneyDao) {
|
||||
this.applicationContext = applicationContext;
|
||||
this.userService = userService;
|
||||
this.tempOrdersTask = tempOrdersTask;
|
||||
this.inviteAchievementService = inviteAchievementService;
|
||||
this.payDetailsService = payDetailsService;
|
||||
this.payDetailsDao = payDetailsDao;
|
||||
this.userMoneyDetailsDao = userMoneyDetailsDao;
|
||||
this.userMoneyDao = userMoneyDao;
|
||||
this.ordersService = ordersService;
|
||||
this.wuyouPay = wuyouPay;
|
||||
this.cashOutDao = cashOutDao;
|
||||
this.sysUserMoneyDao = sysUserMoneyDao;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onApplicationEvent(ApplicationReadyEvent event) {
|
||||
logger.info("应用启动完成后执行一次性方法");
|
||||
|
||||
subscriberService.startSubscriber(new TestNsqSubscriber());
|
||||
|
||||
// List<CashOut> cashOutList = cashOutDao.selectList(new LambdaQueryWrapper<CashOut>()
|
||||
// .eq(CashOut::getState, 2)
|
||||
// .isNull(CashOut::getOutAt)
|
||||
// .eq(CashOut::getRefund, "订单不存在")
|
||||
// .between(CashOut::getCreateAt, "2025-01-07 19:00:00", "2025-01-08 09:26:00"));
|
||||
// logger.info("待处理订单{}", cashOutList.size());
|
||||
// int i = 0;
|
||||
// for (CashOut cashOut : cashOutList) {
|
||||
// logger.info("处理体现订单: {}, 剩余数量: {}", cashOut.getId(), cashOutList.size() - ++i);
|
||||
// try {
|
||||
// BaseResp baseResp = wuyouPay.queryExtractOrder(cashOut.getOrderNumber(), cashOut.getUserId(), cashOut.getUserType() != 2, cashOut.getMoney());
|
||||
// logger.info("baseResp:{} ", JSONUtil.toJsonStr(baseResp));
|
||||
// if (cashOut.getUserType() != null && cashOut.getUserType().equals(2)) {
|
||||
// SysUserMoney sysUserMoney = sysUserMoneyDao.selectOne(new LambdaQueryWrapper<SysUserMoney>().eq(SysUserMoney::getUserId, cashOut.getUserId()));
|
||||
// if (sysUserMoney != null) {
|
||||
// sysUserMoneyDao.decrMoney(cashOut.getMoney(), cashOut.getUserId());
|
||||
// }
|
||||
// }else {
|
||||
// UserMoney userMoney = userMoneyDao.selectOne(new LambdaQueryWrapper<UserMoney>().eq(UserMoney::getUserId, cashOut.getUserId()));
|
||||
// if (userMoney != null) {
|
||||
// userMoneyDao.decrMoney(cashOut.getMoney(), cashOut.getUserId());
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// cashOutDao.update(null, new LambdaUpdateWrapper<CashOut>()
|
||||
// .eq(CashOut::getUserId, cashOut.getUserId())
|
||||
// .eq(CashOut::getState, 3)
|
||||
// .set(CashOut::getRefund, "异常提现")
|
||||
// .set(CashOut::getState, 2));
|
||||
//
|
||||
// if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))){
|
||||
// logger.info("成功订单: {}, {}", cashOut.getId(), cashOut.getUserName());
|
||||
// cashOut.setState(1);
|
||||
// cashOut.setRefund("异常提现1");
|
||||
// cashOut.setOutAt(DateUtil.now());
|
||||
// cashOutDao.update(cashOut, new LambdaQueryWrapper<CashOut>().eq(CashOut::getUserId, cashOut.getUserId()).eq(CashOut::getId, cashOut.getId()));
|
||||
// }
|
||||
// }catch (Exception e) {
|
||||
// logger.error("", e);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2,16 +2,8 @@ package com.sqx;
|
|||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.cache.annotation.EnableCaching;
|
||||
import org.springframework.context.ConfigurableApplicationContext;
|
||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @author GYJ
|
||||
*/
|
||||
@EnableCaching
|
||||
@EnableScheduling
|
||||
@SpringBootApplication
|
||||
public class SqxApplication {
|
||||
|
|
@ -19,13 +11,13 @@ public class SqxApplication {
|
|||
public static void main(String[] args) {
|
||||
SpringApplication.run(SqxApplication.class, args);
|
||||
System.out.println("(♥◠‿◠)ノ゙ 短剧系统启动成功 ლ(´ڡ`ლ)゙ \n"+
|
||||
" _ \n" +
|
||||
" | | \n" +
|
||||
" ___ | | __\n" +
|
||||
" / _ \\| |/ /\n" +
|
||||
"| (_) | < \n" +
|
||||
" \\___/|_|\\_\\");
|
||||
" _ \n" +
|
||||
" | | \n" +
|
||||
" ___ | | __\n" +
|
||||
" / _ \\| |/ /\n" +
|
||||
"| (_) | < \n" +
|
||||
" \\___/|_|\\_\\");
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
package com.sqx.common.annotation;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* @author ww
|
||||
*/
|
||||
@Target(ElementType.METHOD)
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface Debounce {
|
||||
// 防抖时间间隔,默认2秒
|
||||
long interval() default 2000;
|
||||
// 时间单位,默认毫秒
|
||||
TimeUnit timeUnit() default TimeUnit.MILLISECONDS;
|
||||
|
||||
// 用于指定基于的入参表达式,为空时对整个方法防抖
|
||||
// 格式为 #入参键.值 例如: #receive.id
|
||||
// 多个参数 使用逗号进行拼接 例如: #receive.id,#receive.name
|
||||
String value() default "";
|
||||
}
|
||||
|
|
@ -1,79 +0,0 @@
|
|||
package com.sqx.common.aspect;
|
||||
|
||||
import cn.hutool.core.thread.ThreadUtil;
|
||||
import com.google.gson.Gson;
|
||||
import com.sqx.common.utils.HttpContextUtils;
|
||||
import com.sqx.common.utils.IPUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.aspectj.lang.ProceedingJoinPoint;
|
||||
import org.aspectj.lang.annotation.Around;
|
||||
import org.aspectj.lang.annotation.Aspect;
|
||||
import org.aspectj.lang.annotation.Pointcut;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.annotation.Profile;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 方法调用统一切面处理
|
||||
*/
|
||||
@Aspect
|
||||
@Component
|
||||
@Slf4j
|
||||
@Profile({"dev"})
|
||||
public class AppApiMethodAspect {
|
||||
|
||||
@Pointcut("!execution(public * (com.sqx.modules.sys.controller.SysLoginController).*(..)) " +
|
||||
"&& execution(public * (com.sqx.modules.*.controller..*).*(..)))")
|
||||
public void pkg() {
|
||||
}
|
||||
|
||||
@Around("pkg()")
|
||||
public Object around(ProceedingJoinPoint pjp) throws Throwable {
|
||||
long start = System.currentTimeMillis();
|
||||
//避免回填
|
||||
Object[] args = pjp.getArgs();
|
||||
|
||||
// 如果请求参数中包含HttpServletRequest,剔除HttpServletRequest
|
||||
for (int i = 0; i < args.length; i++) {
|
||||
if (args[i] instanceof HttpServletRequest) {
|
||||
args[i] = null;
|
||||
}
|
||||
}
|
||||
|
||||
String params = new Gson().toJson(args);
|
||||
|
||||
// 执行被拦截的方法
|
||||
Object result = pjp.proceed();
|
||||
long end = System.currentTimeMillis();
|
||||
HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
|
||||
String method = request.getMethod();
|
||||
String requestUrl = request.getRequestURL().toString();
|
||||
String requestIp = IPUtils.getIpAddr(request);
|
||||
long useTime = end - start;
|
||||
ThreadUtil.execAsync(() -> {
|
||||
//请求的参数
|
||||
String resultJson = new Gson().toJson(result);
|
||||
try {
|
||||
if (StringUtils.isNotBlank(resultJson) && !"null".equals(resultJson)) {
|
||||
log.info("\n>>>>>> {} {}" +
|
||||
"\n>>>>>> IP: {} " +
|
||||
"\n>>>>>> execute time:{}ms " +
|
||||
"\n>>>>>> Request: {}" +
|
||||
"\n>>>>>> Response: {}",
|
||||
method, requestUrl, requestIp, useTime,
|
||||
params,
|
||||
resultJson
|
||||
);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("Request 为空" + e.getMessage());
|
||||
}
|
||||
});
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,117 +0,0 @@
|
|||
package com.sqx.common.aspect;
|
||||
|
||||
import com.sqx.common.annotation.Debounce;
|
||||
import com.sqx.common.utils.SpelUtil;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.aspectj.lang.ProceedingJoinPoint;
|
||||
import org.aspectj.lang.annotation.Around;
|
||||
import org.aspectj.lang.annotation.Aspect;
|
||||
import org.aspectj.lang.annotation.Pointcut;
|
||||
import org.aspectj.lang.reflect.MethodSignature;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Map.Entry;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
|
||||
|
||||
/**
|
||||
* 防抖切面
|
||||
* @author ww
|
||||
*/
|
||||
@Aspect
|
||||
@Component
|
||||
public class DebounceAspect {
|
||||
|
||||
@Pointcut("@annotation(com.sqx.common.annotation.Debounce)")
|
||||
public void logPointCut() {
|
||||
|
||||
}
|
||||
|
||||
// 用于存储基于方法和入参情况的上次执行时间,结构为:方法签名 -> (入参值 -> 上次执行时间)
|
||||
private static final ConcurrentHashMap<String, ConcurrentHashMap<Object, Long>> executionTimeMap = new ConcurrentHashMap<>();
|
||||
private static final ReentrantLock lock = new ReentrantLock();
|
||||
|
||||
@Around("logPointCut()")
|
||||
public Object aroundDebounce(ProceedingJoinPoint joinPoint) throws Throwable {
|
||||
cleanExpiredRecords();
|
||||
String methodSignature = joinPoint.getSignature().toLongString();
|
||||
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
|
||||
Debounce annotation = signature.getMethod().getAnnotation(Debounce.class);
|
||||
long interval = annotation.interval();
|
||||
TimeUnit timeUnit = annotation.timeUnit();
|
||||
String value = annotation.value();
|
||||
if (StringUtils.isBlank(value)) {
|
||||
// 没有指定入参表达式,按照整个方法进行防抖
|
||||
return debounceForWholeMethod(joinPoint, methodSignature, interval, timeUnit);
|
||||
}
|
||||
String[] split = value.split(",");
|
||||
StringBuilder values = new StringBuilder();
|
||||
for (String str : split) {
|
||||
values.append(SpelUtil.generateKeyBySpEL(str, joinPoint));
|
||||
}
|
||||
// 解析入参表达式,获取对应入参的值
|
||||
|
||||
if (StringUtils.isBlank(values.toString())) {
|
||||
// 如果解析失败或值为null,按照整个方法进行防抖
|
||||
return debounceForWholeMethod(joinPoint, methodSignature, interval, timeUnit);
|
||||
}
|
||||
|
||||
// 根据方法签名和入参值进行防抖判断
|
||||
return debounceForSpecificValue(joinPoint, methodSignature, interval, timeUnit, values.toString());
|
||||
}
|
||||
|
||||
private Object debounceForWholeMethod(ProceedingJoinPoint joinPoint, String methodSignature, long interval, TimeUnit timeUnit) throws Throwable {
|
||||
ConcurrentHashMap<Object, Long> methodExecutionTimeMap = executionTimeMap.computeIfAbsent(methodSignature, k -> new ConcurrentHashMap<>());
|
||||
long currentTime = System.currentTimeMillis();
|
||||
Long lastTime = methodExecutionTimeMap.get(methodSignature);
|
||||
if (lastTime == null) {
|
||||
// 如果不存在对应键值对,设置初始值,这里设置为一个表示很久之前的时间戳,比如0
|
||||
lastTime = 0L;
|
||||
}
|
||||
if (lastTime == null || currentTime - timeUnit.toMillis(interval) >= lastTime) {
|
||||
// 满足防抖间隔,更新上次执行时间,并执行目标方法
|
||||
methodExecutionTimeMap.put(methodSignature, currentTime);
|
||||
return joinPoint.proceed();
|
||||
}
|
||||
// 在防抖间隔内,不执行目标方法,直接返回
|
||||
return null;
|
||||
}
|
||||
|
||||
private Object debounceForSpecificValue(ProceedingJoinPoint joinPoint, String methodSignature, long interval, TimeUnit timeUnit, Object targetValue) throws Throwable {
|
||||
ConcurrentHashMap<Object, Long> methodExecutionTimeMap = executionTimeMap.computeIfAbsent(methodSignature, k -> new ConcurrentHashMap<>());
|
||||
long currentTime = System.currentTimeMillis();
|
||||
Long lastTime = methodExecutionTimeMap.get(targetValue);
|
||||
if (lastTime == null || currentTime - timeUnit.toMillis(interval) >= lastTime) {
|
||||
// 满足防抖间隔,更新上次执行时间,并执行目标方法
|
||||
methodExecutionTimeMap.put(targetValue, currentTime);
|
||||
return joinPoint.proceed();
|
||||
}
|
||||
// 在防抖间隔内,不执行目标方法,直接返回
|
||||
return null;
|
||||
}
|
||||
|
||||
public void cleanExpiredRecords() {
|
||||
long expirationTime = System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(10);
|
||||
lock.lock();
|
||||
try {
|
||||
for (Entry<String, ConcurrentHashMap<Object, Long>> outerEntry : executionTimeMap.entrySet()) {
|
||||
String methodSignature = outerEntry.getKey();
|
||||
ConcurrentHashMap<Object, Long> innerMap = outerEntry.getValue();
|
||||
ConcurrentHashMap<Object, Long> keysToRemove = new ConcurrentHashMap<>();
|
||||
for (Entry<Object, Long> innerEntry : innerMap.entrySet()) {
|
||||
if (innerEntry.getValue() < expirationTime) {
|
||||
keysToRemove.put(innerEntry.getKey(), innerEntry.getValue());
|
||||
}
|
||||
}
|
||||
innerMap.keySet().removeAll(keysToRemove.keySet());
|
||||
if (innerMap.isEmpty()) {
|
||||
executionTimeMap.remove(methodSignature);
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
lock.unlock();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
package com.sqx.common.exception;
|
||||
|
||||
/**
|
||||
* @author GYJoker
|
||||
*/
|
||||
public class CzgException extends Exception {
|
||||
public CzgException(String message) {
|
||||
super(message);
|
||||
}
|
||||
}
|
||||
|
|
@ -5,8 +5,6 @@ import org.apache.shiro.authz.AuthorizationException;
|
|||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.dao.DuplicateKeyException;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.HttpRequestMethodNotSupportedException;
|
||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
||||
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
||||
|
|
@ -67,16 +65,9 @@ public class SqxExceptionHandler {
|
|||
public Result handleException(Exception e, WebRequest webRequest) {
|
||||
logErrorInfo(webRequest);
|
||||
logger.error(e.getMessage(), e);
|
||||
e.printStackTrace();
|
||||
return Result.error();
|
||||
}
|
||||
|
||||
@ExceptionHandler(CzgException.class)
|
||||
public ResponseEntity<Void> handleCzgException() {
|
||||
// 响应状态码为 444 表示无法处理的异常
|
||||
return new ResponseEntity<>(HttpStatus.TOO_MANY_REQUESTS);
|
||||
}
|
||||
|
||||
private void logErrorInfo(WebRequest webRequest) {
|
||||
if (webRequest instanceof ServletWebRequest) {
|
||||
ServletWebRequest servletWebRequest = (ServletWebRequest) webRequest;
|
||||
|
|
|
|||
|
|
@ -1,233 +0,0 @@
|
|||
package com.sqx.common.utils;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.UUID;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
|
||||
/**
|
||||
* 接口访问次数 月为单位
|
||||
*/
|
||||
@Component
|
||||
@Slf4j
|
||||
public class ApiAccessLimitUtil {
|
||||
|
||||
private static final String ACCESS_COUNT_KEY_PREFIX = "sys:limit:";
|
||||
|
||||
private static RedisUtils redisUtils;
|
||||
|
||||
private static final int DEFAULT_ACCESS_COUNT = 5;
|
||||
private static final String DATE_TIME_FORMAT = "month";
|
||||
|
||||
|
||||
@Autowired
|
||||
public void setRedisUtils(RedisUtils redisUtils) {
|
||||
ApiAccessLimitUtil.redisUtils = redisUtils;
|
||||
}
|
||||
|
||||
/**
|
||||
* 默认 当月5次
|
||||
*
|
||||
* @param id 唯一值
|
||||
* @param key 接口名称 sys:limit:接口名称
|
||||
* @return
|
||||
*/
|
||||
public static boolean isAccessAllowed(String id, String key) {
|
||||
String redisKey = generateRedisKey(key, id);
|
||||
Object countObj = redisUtils.get(redisKey);
|
||||
if (countObj == null) {
|
||||
// 根据不同时间周期设置过期时间并初始化访问次数为1
|
||||
long expireAt = calculateExpireAt(DATE_TIME_FORMAT);
|
||||
redisUtils.set(redisKey, 1, expireAt);
|
||||
return true;
|
||||
}
|
||||
if ((int) countObj < DEFAULT_ACCESS_COUNT) {
|
||||
// 访问次数未达上限,次数加1
|
||||
redisUtils.incr(redisKey);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 默认月 month/月/自然月
|
||||
*
|
||||
* @param id 唯一值
|
||||
* @param key 接口名称 sys:limit:接口名称
|
||||
* @param count 次数限制
|
||||
* @return
|
||||
*/
|
||||
public static boolean isAccessAllowed(String id, String key, Integer count) {
|
||||
String redisKey = generateRedisKey(key, id);
|
||||
Object countObj = redisUtils.get(redisKey);
|
||||
if (countObj == null) {
|
||||
// 根据不同时间周期设置过期时间并初始化访问次数为1
|
||||
long expireAt = calculateExpireAt(DATE_TIME_FORMAT);
|
||||
redisUtils.set(redisKey, 1, expireAt);
|
||||
return true;
|
||||
}
|
||||
if ((int) countObj < count) {
|
||||
// 访问次数未达上限,次数加1
|
||||
redisUtils.incr(redisKey);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 默认 5次
|
||||
*
|
||||
* @param id 唯一值
|
||||
* @param key 接口名称 sys:limit:接口名称
|
||||
* @param timeFormat day/天/自然天 week/周/本周日 month/月/自然月 year/年/自然年
|
||||
* @return
|
||||
*/
|
||||
public static boolean isAccessAllowed(String id, String key, String timeFormat) {
|
||||
String redisKey = generateRedisKey(key, id);
|
||||
Object countObj = redisUtils.get(redisKey);
|
||||
if (countObj == null) {
|
||||
// 根据不同时间周期设置过期时间并初始化访问次数为1
|
||||
long expireAt = calculateExpireAt(timeFormat);
|
||||
redisUtils.set(redisKey, 1, expireAt);
|
||||
return true;
|
||||
}
|
||||
if ((int) countObj < DEFAULT_ACCESS_COUNT) {
|
||||
// 访问次数未达上限,次数加1
|
||||
redisUtils.incr(redisKey);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param id 唯一值
|
||||
* @param key 接口名称 sys:limit:接口名称
|
||||
* @param count 次数限制
|
||||
* @param timeFormat day/天/自然天 week/周/本周日 month/月/自然月 year/年/自然年
|
||||
* @return
|
||||
*/
|
||||
public static boolean isAccessAllowed(String id, String key, Integer count, String timeFormat) {
|
||||
String redisKey = generateRedisKey(key, id);
|
||||
Object countObj = redisUtils.get(redisKey);
|
||||
if (countObj == null) {
|
||||
long expireAt;
|
||||
if (StrUtil.isBlank(timeFormat)) {
|
||||
expireAt = count;
|
||||
} else {
|
||||
// 根据不同时间周期设置过期时间并初始化访问次数为1
|
||||
expireAt = calculateExpireAt(timeFormat);
|
||||
}
|
||||
redisUtils.set(redisKey, 1, expireAt);
|
||||
return true;
|
||||
}
|
||||
if (Integer.parseInt(countObj.toString()) < count) {
|
||||
// 访问次数未达上限,次数加1
|
||||
redisUtils.incr(redisKey);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static boolean getCertAuthIsAccessAllowed(String id, String key, Integer count) {
|
||||
String redisKey = "app:updateLimit:auth:" + key + ":" + id;
|
||||
Object countObj = redisUtils.get(redisKey);
|
||||
if (countObj == null) {
|
||||
return true;
|
||||
}
|
||||
return Integer.parseInt(countObj.toString()) < count;
|
||||
}
|
||||
|
||||
public static void setCertAuthIsAccessAllowed(String id, String key, Integer count, String timeFormat) {
|
||||
String redisKey = "app:updateLimit:auth:" + key + ":" + id;
|
||||
Object countObj = redisUtils.get(redisKey);
|
||||
if (countObj == null) {
|
||||
long expireAt;
|
||||
if (StrUtil.isBlank(timeFormat)) {
|
||||
expireAt = count;
|
||||
} else {
|
||||
// 根据不同时间周期设置过期时间并初始化访问次数为1
|
||||
expireAt = calculateExpireAt(timeFormat);
|
||||
}
|
||||
redisUtils.set(redisKey, 1, expireAt);
|
||||
} else {
|
||||
redisUtils.incr(redisKey);
|
||||
}
|
||||
}
|
||||
|
||||
public static void removeKey(String id, String key) {
|
||||
String redisKey = generateRedisKey(key, id);
|
||||
redisUtils.delete(redisKey);
|
||||
}
|
||||
|
||||
|
||||
public static <T> T runFunAndCheckKey(Supplier<T> supplier, String lockKey, Integer seconds) {
|
||||
try {
|
||||
// 创建线程id, 用作判断
|
||||
String clientId = UUID.randomUUID().toString();
|
||||
// 设置分布式锁
|
||||
boolean lock = Boolean.TRUE.equals(redisUtils.setIfAbsent(lockKey, clientId, seconds));
|
||||
int count = 0;
|
||||
while (!lock) {
|
||||
if (count++ > 100) {
|
||||
throw new RuntimeException("系统繁忙, 稍后再试");
|
||||
}
|
||||
Thread.sleep(20);
|
||||
lock = Boolean.TRUE.equals(redisUtils.setIfAbsent(lockKey, clientId, seconds));
|
||||
}
|
||||
return supplier.get();
|
||||
} catch (RuntimeException e) {
|
||||
log.error("执行出错", e);
|
||||
throw e;
|
||||
} catch (InterruptedException e) {
|
||||
throw new RuntimeException(e);
|
||||
} finally {
|
||||
redisUtils.delete(lockKey);
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean isAccessAllowed(String id, String key, Integer count, Integer seconds) {
|
||||
String redisKey = generateRedisKey(key, id);
|
||||
Object countObj = redisUtils.get(redisKey);
|
||||
if (countObj == null) {
|
||||
// 根据不同时间周期设置过期时间并初始化访问次数为1
|
||||
redisUtils.set(redisKey, 1, seconds);
|
||||
return true;
|
||||
}
|
||||
if (Integer.parseInt(countObj.toString()) < count) {
|
||||
// 访问次数未达上限,次数加1
|
||||
redisUtils.incr(redisKey);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
private static String generateRedisKey(String key, String id) {
|
||||
return ACCESS_COUNT_KEY_PREFIX + key + ":" + id;
|
||||
}
|
||||
|
||||
private static long calculateExpireAt(String timePeriod) {
|
||||
Date now = DateUtil.beginOfDay(DateUtil.date());
|
||||
Date expireDate = null;
|
||||
if ("day".equals(timePeriod)) {
|
||||
expireDate = DateUtil.endOfDay(now);
|
||||
} else if ("week".equals(timePeriod)) {
|
||||
expireDate = DateUtil.endOfWeek(now);
|
||||
} else if ("month".equals(timePeriod)) {
|
||||
expireDate = DateUtil.endOfMonth(now);
|
||||
} else if ("year".equals(timePeriod)) {
|
||||
expireDate = DateUtil.endOfYear(now);
|
||||
}
|
||||
long endTimeStamp = DateUtil.endOfDay(expireDate).getTime() / 1000L;
|
||||
long currentTimeStamp = DateUtil.currentSeconds();
|
||||
return endTimeStamp - currentTimeStamp;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,154 +0,0 @@
|
|||
package com.sqx.common.utils;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
/**
|
||||
* 数据出现次数
|
||||
*/
|
||||
@Component
|
||||
public class DataLimitUtil {
|
||||
|
||||
private static final String ACCESS_COUNT_KEY_PREFIX = "sys:data:";
|
||||
|
||||
private static RedisUtils redisUtils;
|
||||
|
||||
private static final int DEFAULT_ACCESS_COUNT = 5;
|
||||
private static final String DATE_TIME_FORMAT = "month";
|
||||
|
||||
|
||||
@Autowired
|
||||
public void setRedisUtils(RedisUtils redisUtils) {
|
||||
DataLimitUtil.redisUtils = redisUtils;
|
||||
}
|
||||
|
||||
/**
|
||||
* 默认 当月5次
|
||||
*
|
||||
* @param key 名称 sys:data:名称
|
||||
* @return
|
||||
*/
|
||||
public static boolean isAccessAllowed(String key) {
|
||||
String redisKey = generateRedisKey(key);
|
||||
Object countObj = redisUtils.get(redisKey);
|
||||
if (countObj == null) {
|
||||
// 根据不同时间周期设置过期时间并初始化访问次数为1
|
||||
long expireAt = calculateExpireAt(DATE_TIME_FORMAT);
|
||||
redisUtils.set(redisKey, 1, expireAt);
|
||||
return true;
|
||||
}
|
||||
if ((int) countObj < DEFAULT_ACCESS_COUNT) {
|
||||
// 访问次数未达上限,次数加1
|
||||
redisUtils.incr(redisKey);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 默认月 month/月/自然月
|
||||
*
|
||||
* @param key 名称 sys:data:名称
|
||||
* @param count 次数限制
|
||||
* @return
|
||||
*/
|
||||
public static boolean isAccessAllowed(String key, Integer count) {
|
||||
String redisKey = generateRedisKey(key);
|
||||
Object countObj = redisUtils.get(redisKey);
|
||||
if (countObj == null) {
|
||||
// 根据不同时间周期设置过期时间并初始化访问次数为1
|
||||
long expireAt = calculateExpireAt(DATE_TIME_FORMAT);
|
||||
redisUtils.set(redisKey, 1, expireAt);
|
||||
return true;
|
||||
}
|
||||
if ((int) countObj < count) {
|
||||
// 访问次数未达上限,次数加1
|
||||
redisUtils.incr(redisKey);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 默认 5次
|
||||
*
|
||||
* @param key 名称 sys:data:名称
|
||||
* @param timeFormat day/天/自然天 week/周/本周日 month/月/自然月 year/年/自然年
|
||||
* @return
|
||||
*/
|
||||
public static boolean isAccessAllowed(String key, String timeFormat) {
|
||||
String redisKey = generateRedisKey(key);
|
||||
Object countObj = redisUtils.get(redisKey);
|
||||
if (countObj == null) {
|
||||
// 根据不同时间周期设置过期时间并初始化访问次数为1
|
||||
long expireAt = calculateExpireAt(timeFormat);
|
||||
redisUtils.set(redisKey, 1, expireAt);
|
||||
return true;
|
||||
}
|
||||
if ((int) countObj < DEFAULT_ACCESS_COUNT) {
|
||||
// 访问次数未达上限,次数加1
|
||||
redisUtils.incr(redisKey);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static boolean isAllowed(String key, int seconds) {
|
||||
String redisKey = generateRedisKey(key);
|
||||
if (!redisUtils.hasKey(key)) {
|
||||
redisUtils.set(redisKey, 1, seconds);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param key 名称 sys:data:名称
|
||||
* @param count 次数限制
|
||||
* @param timeFormat day/天/自然天 week/周/本周日 month/月/自然月 year/年/自然年
|
||||
* @return
|
||||
*/
|
||||
public static boolean isAccessAllowed(String key, Integer count, String timeFormat) {
|
||||
String redisKey = generateRedisKey(key);
|
||||
Object countObj = redisUtils.get(redisKey);
|
||||
if (countObj == null) {
|
||||
// 根据不同时间周期设置过期时间并初始化访问次数为1
|
||||
long expireAt = calculateExpireAt(timeFormat);
|
||||
redisUtils.set(redisKey, 1, expireAt);
|
||||
return true;
|
||||
}
|
||||
if (Integer.parseInt(countObj.toString()) < count) {
|
||||
// 访问次数未达上限,次数加1
|
||||
redisUtils.incr(redisKey);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
private static String generateRedisKey(String key) {
|
||||
return ACCESS_COUNT_KEY_PREFIX + key;
|
||||
}
|
||||
|
||||
private static long calculateExpireAt(String timePeriod) {
|
||||
Date now = DateUtil.beginOfDay(DateUtil.date());
|
||||
Date expireDate = null;
|
||||
if ("day".equals(timePeriod)) {
|
||||
expireDate = DateUtil.endOfDay(now);
|
||||
} else if ("week".equals(timePeriod)) {
|
||||
expireDate = DateUtil.endOfWeek(now);
|
||||
} else if ("month".equals(timePeriod)) {
|
||||
expireDate = DateUtil.endOfMonth(now);
|
||||
} else if ("year".equals(timePeriod)) {
|
||||
expireDate = DateUtil.endOfYear(now);
|
||||
}
|
||||
long endTimeStamp = DateUtil.endOfDay(expireDate).getTime() / 1000L;
|
||||
long currentTimeStamp = DateUtil.currentSeconds();
|
||||
return endTimeStamp - currentTimeStamp;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
package com.sqx.common.utils;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.joda.time.DateTime;
|
||||
import org.joda.time.LocalDate;
|
||||
|
|
@ -160,17 +159,4 @@ public class DateUtils {
|
|||
DateTime dateTime = new DateTime(date);
|
||||
return dateTime.plusYears(years).toDate();
|
||||
}
|
||||
|
||||
|
||||
//获取当日剩余秒数
|
||||
public static long todayAfterSecond() {
|
||||
Date now = new Date();
|
||||
// 获取当天结束时间(即当天23:59:59对应的Date对象)
|
||||
Date endOfDay = DateUtil.endOfDay(now);
|
||||
// 计算时间差(单位为毫秒)
|
||||
long diffMillis = endOfDay.getTime() - now.getTime();
|
||||
// 将毫秒转换为秒
|
||||
long diffSeconds = diffMillis / 1000;
|
||||
return diffSeconds;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.sqx.common.utils;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import com.alibaba.druid.util.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,120 +1,101 @@
|
|||
package com.sqx.common.utils;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 分页工具类
|
||||
*
|
||||
*/
|
||||
public class PageUtils implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
/**
|
||||
* 总记录数
|
||||
*/
|
||||
private int totalCount;
|
||||
/**
|
||||
* 每页记录数
|
||||
*/
|
||||
private int pageSize;
|
||||
/**
|
||||
* 总页数
|
||||
*/
|
||||
private int totalPage;
|
||||
/**
|
||||
* 当前页数
|
||||
*/
|
||||
private int currPage;
|
||||
/**
|
||||
* 列表数据
|
||||
*/
|
||||
private List<?> list;
|
||||
private List<?> records;
|
||||
private static final long serialVersionUID = 1L;
|
||||
/**
|
||||
* 总记录数
|
||||
*/
|
||||
private int totalCount;
|
||||
/**
|
||||
* 每页记录数
|
||||
*/
|
||||
private int pageSize;
|
||||
/**
|
||||
* 总页数
|
||||
*/
|
||||
private int totalPage;
|
||||
/**
|
||||
* 当前页数
|
||||
*/
|
||||
private int currPage;
|
||||
/**
|
||||
* 列表数据
|
||||
*/
|
||||
private List<?> list;
|
||||
|
||||
/**
|
||||
* 分页
|
||||
* @param list 列表数据
|
||||
* @param totalCount 总记录数
|
||||
* @param pageSize 每页记录数
|
||||
* @param currPage 当前页数
|
||||
*/
|
||||
public PageUtils(List<?> list, int totalCount, int pageSize, int currPage) {
|
||||
this.list = list;
|
||||
this.totalCount = totalCount;
|
||||
this.pageSize = pageSize;
|
||||
this.currPage = currPage;
|
||||
this.totalPage = (int)Math.ceil((double)totalCount/pageSize);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页
|
||||
*/
|
||||
public PageUtils(IPage<?> page) {
|
||||
this.list = page.getRecords();
|
||||
this.totalCount = (int)page.getTotal();
|
||||
this.pageSize = (int)page.getSize();
|
||||
this.currPage = (int)page.getCurrent();
|
||||
this.totalPage = (int)page.getPages();
|
||||
}
|
||||
|
||||
public PageUtils() {
|
||||
}
|
||||
public int getTotalCount() {
|
||||
return totalCount;
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页
|
||||
*
|
||||
* @param list 列表数据
|
||||
* @param totalCount 总记录数
|
||||
* @param pageSize 每页记录数
|
||||
* @param currPage 当前页数
|
||||
*/
|
||||
public PageUtils(List<?> list, int totalCount, int pageSize, int currPage) {
|
||||
this.list = list;
|
||||
this.totalCount = totalCount;
|
||||
this.pageSize = pageSize;
|
||||
this.currPage = currPage;
|
||||
this.totalPage = (int) Math.ceil((double) totalCount / pageSize);
|
||||
}
|
||||
public void setTotalCount(int totalCount) {
|
||||
this.totalCount = totalCount;
|
||||
}
|
||||
|
||||
public static PageUtils page(PageInfo<?> page) {
|
||||
return page(page,false);
|
||||
}
|
||||
public int getPageSize() {
|
||||
return pageSize;
|
||||
}
|
||||
|
||||
public static PageUtils page(PageInfo<?> page, boolean isRecords) {
|
||||
PageUtils pageUtils = new PageUtils();
|
||||
if (isRecords) {
|
||||
pageUtils.records = page.getList();
|
||||
} else {
|
||||
pageUtils.list = page.getList();
|
||||
}
|
||||
pageUtils.totalCount = (int) page.getTotal();
|
||||
pageUtils.pageSize = page.getSize();
|
||||
pageUtils.currPage = page.getPageNum();
|
||||
pageUtils.totalPage = page.getPages();
|
||||
return pageUtils;
|
||||
}
|
||||
public void setPageSize(int pageSize) {
|
||||
this.pageSize = pageSize;
|
||||
}
|
||||
|
||||
public int getTotalCount() {
|
||||
return totalCount;
|
||||
}
|
||||
public int getTotalPage() {
|
||||
return totalPage;
|
||||
}
|
||||
|
||||
public void setTotalCount(int totalCount) {
|
||||
this.totalCount = totalCount;
|
||||
}
|
||||
public void setTotalPage(int totalPage) {
|
||||
this.totalPage = totalPage;
|
||||
}
|
||||
|
||||
public int getPageSize() {
|
||||
return pageSize;
|
||||
}
|
||||
public int getCurrPage() {
|
||||
return currPage;
|
||||
}
|
||||
|
||||
public void setPageSize(int pageSize) {
|
||||
this.pageSize = pageSize;
|
||||
}
|
||||
public void setCurrPage(int currPage) {
|
||||
this.currPage = currPage;
|
||||
}
|
||||
|
||||
public int getTotalPage() {
|
||||
return totalPage;
|
||||
}
|
||||
public List<?> getList() {
|
||||
return list;
|
||||
}
|
||||
|
||||
public void setTotalPage(int totalPage) {
|
||||
this.totalPage = totalPage;
|
||||
}
|
||||
|
||||
public int getCurrPage() {
|
||||
return currPage;
|
||||
}
|
||||
|
||||
public void setCurrPage(int currPage) {
|
||||
this.currPage = currPage;
|
||||
}
|
||||
|
||||
public List<?> getList() {
|
||||
return list;
|
||||
}
|
||||
|
||||
public void setList(List<?> list) {
|
||||
this.list = list;
|
||||
}
|
||||
|
||||
public List<?> getRecords() {
|
||||
return records;
|
||||
}
|
||||
|
||||
public void setRecords(List<?> records) {
|
||||
this.records = records;
|
||||
}
|
||||
public void setList(List<?> list) {
|
||||
this.list = list;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,68 @@
|
|||
package com.sqx.common.utils;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.metadata.OrderItem;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.sqx.common.xss.SQLFilter;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 查询参数
|
||||
*
|
||||
*/
|
||||
public class Query<T> {
|
||||
|
||||
public IPage<T> getPage(Map<String, Object> params) {
|
||||
return this.getPage(params, null, false);
|
||||
}
|
||||
|
||||
public IPage<T> getPage(Map<String, Object> params, String defaultOrderField, boolean isAsc) {
|
||||
//分页参数
|
||||
long curPage = 1;
|
||||
long limit = 10;
|
||||
|
||||
if(params.get(Constant.PAGE) != null){
|
||||
curPage = Long.parseLong(String.valueOf(params.get(Constant.PAGE)));
|
||||
}
|
||||
if(params.get(Constant.LIMIT) != null){
|
||||
limit = Long.parseLong(String.valueOf(params.get(Constant.LIMIT)));
|
||||
}
|
||||
|
||||
//分页对象
|
||||
Page<T> page = new Page<>(curPage, limit);
|
||||
|
||||
//分页参数
|
||||
params.put(Constant.PAGE, page);
|
||||
|
||||
//排序字段
|
||||
//防止SQL注入(因为sidx、order是通过拼接SQL实现排序的,会有SQL注入风险)
|
||||
String orderField = SQLFilter.sqlInject((String)params.get(Constant.ORDER_FIELD));
|
||||
String order = (String)params.get(Constant.ORDER);
|
||||
|
||||
|
||||
//前端字段排序
|
||||
if(StringUtils.isNotEmpty(orderField) && StringUtils.isNotEmpty(order)){
|
||||
if(Constant.ASC.equalsIgnoreCase(order)) {
|
||||
return page.addOrder(OrderItem.asc(orderField));
|
||||
}else {
|
||||
return page.addOrder(OrderItem.desc(orderField));
|
||||
}
|
||||
}
|
||||
|
||||
//没有排序字段,则不排序
|
||||
if(StringUtils.isBlank(defaultOrderField)){
|
||||
return page;
|
||||
}
|
||||
|
||||
//默认排序
|
||||
if(isAsc) {
|
||||
page.addOrder(OrderItem.asc(defaultOrderField));
|
||||
}else {
|
||||
page.addOrder(OrderItem.desc(defaultOrderField));
|
||||
}
|
||||
|
||||
return page;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,54 +1,12 @@
|
|||
package com.sqx.common.utils;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
|
||||
/**
|
||||
* Redis所有Keys
|
||||
*
|
||||
*/
|
||||
public class RedisKeys {
|
||||
|
||||
public static final String FREE_WATCH_KEY = "free:watch:";
|
||||
public static final String LOCK_KEY = "SYS:LOCK:";
|
||||
public static final String RATE_LIMIT = "RATE:z";
|
||||
|
||||
|
||||
|
||||
public static String getSysConfigKey(String key){
|
||||
return "sys:config:" + key;
|
||||
}
|
||||
|
||||
public static String getDateKey(String key){
|
||||
return "date:" + key;
|
||||
}
|
||||
|
||||
public static String getFreeWatchKey(Long userId, boolean isPermanently) {
|
||||
if (isPermanently) {
|
||||
return FREE_WATCH_KEY + userId;
|
||||
}
|
||||
return FREE_WATCH_KEY + DateUtil.today() + ":" + userId;
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.out.println(DateUtil.today());
|
||||
}
|
||||
|
||||
|
||||
public static String getLockKey(String sign, Object... args) {
|
||||
StringBuilder key = new StringBuilder(LOCK_KEY + ":" + sign + ":");
|
||||
for (Object arg : args) {
|
||||
if (arg != null) {
|
||||
key.append(":").append(arg);
|
||||
}
|
||||
}
|
||||
return key.toString();
|
||||
}
|
||||
|
||||
public static String getUserIpRateKey(long userId, String ip) {
|
||||
return RATE_LIMIT + "user:" + userId + ":ip:" + ip;
|
||||
}
|
||||
|
||||
public static String getUserUrlRateKey(long userId, String url) {
|
||||
return RATE_LIMIT + "user:" + userId + ":url:" + url;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +1,18 @@
|
|||
package com.sqx.common.utils;
|
||||
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.google.gson.Gson;
|
||||
import com.sqx.modules.redisService.RedisService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.redis.core.*;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.lang.invoke.MethodHandle;
|
||||
import java.lang.invoke.MethodHandles;
|
||||
import java.lang.invoke.MethodType;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* Redis工具类
|
||||
*
|
||||
*/
|
||||
@Component
|
||||
public class RedisUtils {
|
||||
@Autowired
|
||||
private RedisService redisService;
|
||||
@Autowired
|
||||
private RedisTemplate<String, Object> redisTemplate;
|
||||
@Autowired
|
||||
|
|
@ -36,169 +25,38 @@ public class RedisUtils {
|
|||
private SetOperations<String, Object> setOperations;
|
||||
@Autowired
|
||||
private ZSetOperations<String, Object> zSetOperations;
|
||||
/**
|
||||
* 默认过期时长,单位:秒
|
||||
*/
|
||||
/** 默认过期时长,单位:秒 */
|
||||
public final static long DEFAULT_EXPIRE = 60 * 60 * 24;
|
||||
/**
|
||||
* 不设置过期时长
|
||||
*/
|
||||
/** 不设置过期时长 */
|
||||
public final static long NOT_EXPIRE = -1;
|
||||
private final static Gson Gson = new Gson();
|
||||
|
||||
|
||||
public <T> Map<String, List<T>> getMapData(String key, String method, Class<T> clazz) {
|
||||
String jsonStr = getDate(key, method);
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
try {
|
||||
JsonNode jsonNode = objectMapper.readTree(jsonStr);
|
||||
|
||||
return jsonNodeToMap(jsonNode, clazz);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public <T> List<T> getListData(String key, Class<T> clazz, String method) {
|
||||
String jsonStr = getDate(key, method);
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
try {
|
||||
// 将JSON字符串转换为List<T>
|
||||
return objectMapper.readValue(jsonStr, objectMapper.getTypeFactory().constructCollectionType(List.class, clazz));
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取缓存里的数据 如果不存在 则插入 并返回
|
||||
*
|
||||
* @param key redis Key
|
||||
* @param clazz 返回类型
|
||||
* @param method RedisService调用的方法名 如果数据不存在会执行该调用方法
|
||||
*/
|
||||
public <T> T getObjectDate(String key, Class<T> clazz, String method) {
|
||||
String jsonStr = getDate(key, method);
|
||||
return this.fromJson(jsonStr, clazz);
|
||||
}
|
||||
|
||||
public <T> T getObjectDate(String key, Class<T> clazz) {
|
||||
String jsonStr = get(key);
|
||||
return this.fromJson(jsonStr, clazz);
|
||||
}
|
||||
|
||||
public String getDate(String key, String method) {
|
||||
if (!this.hasKey(key)) {
|
||||
try {
|
||||
// 获取Lookup对象
|
||||
MethodHandles.Lookup lookup = MethodHandles.lookup();
|
||||
// 构建方法类型(这里假设方法无参数,返回类型为void)
|
||||
MethodType methodType = MethodType.methodType(void.class, String.class);
|
||||
// 获取方法句柄
|
||||
MethodHandle methodHandle = lookup.findVirtual(redisService.getClass(), method, methodType);
|
||||
// 调用方法句柄
|
||||
methodHandle.invoke(redisService, key);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
} catch (Throwable e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
return this.get(key);
|
||||
}
|
||||
|
||||
public boolean hasKey(String key) {
|
||||
return redisTemplate.hasKey(key);
|
||||
}
|
||||
|
||||
public void set(String key, Object value, long expire) {
|
||||
public void set(String key, Object value, long expire){
|
||||
valueOperations.set(key, toJson(value));
|
||||
if (expire != NOT_EXPIRE) {
|
||||
redisTemplate.expire(key, expire, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public boolean setIfAbsent(String key, Object value, long expire){
|
||||
Boolean absent = valueOperations.setIfAbsent(key, toJson(value));
|
||||
if (Boolean.FALSE.equals(absent)) {
|
||||
return false;
|
||||
}
|
||||
if(expire != NOT_EXPIRE){
|
||||
redisTemplate.expire(key, expire, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
public void set(String key, Object value) {
|
||||
public void set(String key, Object value){
|
||||
set(key, value, DEFAULT_EXPIRE);
|
||||
}
|
||||
|
||||
public void expire(String key, long seconds){
|
||||
redisTemplate.expire(key, seconds, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
public <T> T get(String key, Class<T> clazz, long expire) {
|
||||
String value = valueOperations.get(key);
|
||||
if (expire != NOT_EXPIRE) {
|
||||
if(expire != NOT_EXPIRE){
|
||||
redisTemplate.expire(key, expire, TimeUnit.SECONDS);
|
||||
}
|
||||
return value == null ? null : fromJson(value, clazz);
|
||||
}
|
||||
|
||||
// 判断键是否设置了过期时间
|
||||
public boolean isExpiredSet(String key) {
|
||||
// 获取过期时间,单位是秒
|
||||
Long expireTime = redisTemplate.getExpire(key);
|
||||
|
||||
if (expireTime == null) {
|
||||
return false; // 如果返回 null,表示键不存在
|
||||
}
|
||||
|
||||
return expireTime != -1; // 如果是 -1,说明没有设置过期时间
|
||||
}
|
||||
|
||||
public Long getExpire(String key) {
|
||||
Long currentExpireTime = redisTemplate.getExpire(key);
|
||||
if (currentExpireTime == null || currentExpireTime == -2 || currentExpireTime == -1) {
|
||||
return null;
|
||||
}
|
||||
return currentExpireTime;
|
||||
}
|
||||
|
||||
// 累加过期时间
|
||||
public boolean extendExpireTime(String key, long additionalTimeInSeconds) {
|
||||
// 获取当前键的剩余过期时间(单位:秒)
|
||||
Long currentExpireTime = redisTemplate.getExpire(key);
|
||||
|
||||
if (currentExpireTime == null || currentExpireTime == -2) {
|
||||
// 键不存在或已经过期,无法进行累加
|
||||
return false;
|
||||
}
|
||||
|
||||
if (currentExpireTime == -1) {
|
||||
redisTemplate.expire(key, additionalTimeInSeconds, java.util.concurrent.TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
// 累加剩余过期时间和新增时间
|
||||
long newExpireTime = currentExpireTime + additionalTimeInSeconds;
|
||||
|
||||
// 设置新的过期时间
|
||||
return Boolean.TRUE.equals(redisTemplate.expire(key, newExpireTime, TimeUnit.SECONDS));
|
||||
}
|
||||
|
||||
public <T> T get(String key, Class<T> clazz) {
|
||||
return get(key, clazz, NOT_EXPIRE);
|
||||
}
|
||||
|
||||
public String get(String key, long expire) {
|
||||
String value = valueOperations.get(key);
|
||||
if (expire != NOT_EXPIRE) {
|
||||
if(expire != NOT_EXPIRE){
|
||||
redisTemplate.expire(key, expire, TimeUnit.SECONDS);
|
||||
}
|
||||
return value;
|
||||
|
|
@ -208,21 +66,6 @@ public class RedisUtils {
|
|||
return get(key, NOT_EXPIRE);
|
||||
}
|
||||
|
||||
/**
|
||||
* 对指定的键执行自增操作,返回自增后的值
|
||||
*
|
||||
* @param key 要自增的键
|
||||
* @return 自增后的值,如果键不存在则初始化为1后返回1,如果出现异常返回null
|
||||
*/
|
||||
public Long incr(String key) {
|
||||
try {
|
||||
return redisTemplate.opsForValue().increment(key);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public void delete(String key) {
|
||||
redisTemplate.delete(key);
|
||||
}
|
||||
|
|
@ -230,9 +73,9 @@ public class RedisUtils {
|
|||
/**
|
||||
* Object转成JSON数据
|
||||
*/
|
||||
private String toJson(Object object) {
|
||||
if (object instanceof Integer || object instanceof Long || object instanceof Float ||
|
||||
object instanceof Double || object instanceof Boolean || object instanceof String) {
|
||||
private String toJson(Object object){
|
||||
if(object instanceof Integer || object instanceof Long || object instanceof Float ||
|
||||
object instanceof Double || object instanceof Boolean || object instanceof String){
|
||||
return String.valueOf(object);
|
||||
}
|
||||
return Gson.toJson(object);
|
||||
|
|
@ -241,25 +84,7 @@ public class RedisUtils {
|
|||
/**
|
||||
* JSON数据,转成Object
|
||||
*/
|
||||
private <T> T fromJson(String json, Class<T> clazz) {
|
||||
private <T> T fromJson(String json, Class<T> clazz){
|
||||
return Gson.fromJson(json, clazz);
|
||||
}
|
||||
|
||||
|
||||
public <T> Map<String, List<T>> jsonNodeToMap(JsonNode jsonNode, Class<T> clazz) {
|
||||
Map<String, List<T>> resultMap = new HashMap<>();
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
|
||||
if (jsonNode.isObject()) {
|
||||
// 获取字段名(也就是键)的迭代器
|
||||
Iterator<String> fieldNames = jsonNode.fieldNames();
|
||||
while (fieldNames.hasNext()) {
|
||||
String key = fieldNames.next();
|
||||
JsonNode elementNode = jsonNode.get(key);
|
||||
resultMap.put(key, objectMapper.convertValue(elementNode,
|
||||
objectMapper.getTypeFactory().constructCollectionType(List.class, clazz)));
|
||||
}
|
||||
}
|
||||
return resultMap;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,52 +0,0 @@
|
|||
package com.sqx.common.utils;
|
||||
|
||||
import org.aspectj.lang.ProceedingJoinPoint;
|
||||
import org.aspectj.lang.reflect.MethodSignature;
|
||||
import org.springframework.core.DefaultParameterNameDiscoverer;
|
||||
import org.springframework.expression.EvaluationContext;
|
||||
import org.springframework.expression.Expression;
|
||||
import org.springframework.expression.spel.standard.SpelExpressionParser;
|
||||
import org.springframework.expression.spel.support.StandardEvaluationContext;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
public class SpelUtil {
|
||||
/**
|
||||
* 用于SpEL表达式解析.
|
||||
*/
|
||||
private static final SpelExpressionParser parser = new SpelExpressionParser();
|
||||
|
||||
/**
|
||||
* 用于获取方法参数定义名字.
|
||||
*/
|
||||
private static final DefaultParameterNameDiscoverer nameDiscoverer = new DefaultParameterNameDiscoverer();
|
||||
|
||||
/**
|
||||
* 解析SpEL表达式
|
||||
*
|
||||
* @param spELStr
|
||||
* @param joinPoint
|
||||
* @return
|
||||
*/
|
||||
public static String generateKeyBySpEL(String spELStr, ProceedingJoinPoint joinPoint) {
|
||||
// 通过joinPoint获取被注解方法
|
||||
MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
|
||||
Method method = methodSignature.getMethod();
|
||||
// 使用Spring的DefaultParameterNameDiscoverer获取方法形参名数组
|
||||
String[] paramNames = nameDiscoverer.getParameterNames(method);
|
||||
// // 解析过后的Spring表达式对象
|
||||
Expression expression = parser.parseExpression(spELStr);
|
||||
// Spring的表达式上下文对象
|
||||
EvaluationContext context = new StandardEvaluationContext();
|
||||
// 通过joinPoint获取被注解方法的形参
|
||||
Object[] args = joinPoint.getArgs();
|
||||
// 给上下文赋值
|
||||
for (int i = 0; i < args.length; i++) {
|
||||
context.setVariable(paramNames[i], args[i]);
|
||||
}
|
||||
if(expression.getValue(context)==null){
|
||||
return "";
|
||||
}
|
||||
return expression.getValue(context).toString();
|
||||
}
|
||||
}
|
||||
|
|
@ -23,11 +23,6 @@ public class SpringContextUtils implements ApplicationContextAware {
|
|||
return applicationContext.getBean(name);
|
||||
}
|
||||
|
||||
public static Object getSpringBean(Class<?> clazz) {
|
||||
return applicationContext == null ? null : applicationContext.getBean(clazz);
|
||||
}
|
||||
|
||||
|
||||
public static <T> T getBean(String name, Class<T> requiredType) {
|
||||
return applicationContext.getBean(name, requiredType);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,20 +1,12 @@
|
|||
package com.sqx.config;
|
||||
|
||||
import com.sqx.common.utils.RedisUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.cache.CacheManager;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.data.redis.cache.RedisCacheConfiguration;
|
||||
import org.springframework.data.redis.cache.RedisCacheManager;
|
||||
import org.springframework.data.redis.connection.RedisConnectionFactory;
|
||||
import org.springframework.data.redis.core.*;
|
||||
import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
|
||||
import org.springframework.data.redis.serializer.RedisSerializationContext;
|
||||
import org.springframework.data.redis.serializer.StringRedisSerializer;
|
||||
|
||||
import java.time.Duration;
|
||||
|
||||
/**
|
||||
* Redis配置
|
||||
*
|
||||
|
|
@ -24,18 +16,6 @@ public class RedisConfig {
|
|||
@Autowired
|
||||
private RedisConnectionFactory factory;
|
||||
|
||||
@Bean
|
||||
public CacheManager cacheManager(RedisConnectionFactory redisConnectionFactory) {
|
||||
RedisCacheConfiguration cacheConfiguration = RedisCacheConfiguration.defaultCacheConfig().entryTtl(Duration.ofMinutes(30))
|
||||
// 设置缓存过期时间为30分钟
|
||||
.serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
|
||||
.serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer()))
|
||||
.disableCachingNullValues();
|
||||
|
||||
return RedisCacheManager.builder(redisConnectionFactory)
|
||||
.cacheDefaults(cacheConfiguration)
|
||||
.build();
|
||||
}
|
||||
@Bean
|
||||
public RedisTemplate<String, Object> redisTemplate() {
|
||||
RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
|
||||
|
|
@ -71,10 +51,4 @@ public class RedisConfig {
|
|||
public ZSetOperations<String, Object> zSetOperations(RedisTemplate<String, Object> redisTemplate) {
|
||||
return redisTemplate.opsForZSet();
|
||||
}
|
||||
|
||||
@Bean
|
||||
public RedisUtils redisUtils() {
|
||||
// 根据实际情况初始化RedisUtils实例,可能需要传入相关配置参数,如Redis连接信息等
|
||||
return new RedisUtils();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,242 +0,0 @@
|
|||
package com.sqx.config;
|
||||
|
||||
import com.sqx.modules.utils.InvitationCodeUtil;
|
||||
import com.sqx.sharding.MasterSlaveRules;
|
||||
import com.sqx.sharding.ShardingDataBase;
|
||||
import com.sqx.sharding.StandardShardingStrategyConf;
|
||||
import com.zaxxer.hikari.HikariConfig;
|
||||
import com.zaxxer.hikari.HikariDataSource;
|
||||
import lombok.Data;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.shardingsphere.api.config.masterslave.MasterSlaveRuleConfiguration;
|
||||
import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
|
||||
import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration;
|
||||
import org.apache.shardingsphere.api.config.sharding.TableRuleConfiguration;
|
||||
import org.apache.shardingsphere.api.config.sharding.strategy.InlineShardingStrategyConfiguration;
|
||||
import org.apache.shardingsphere.api.config.sharding.strategy.StandardShardingStrategyConfiguration;
|
||||
import org.apache.shardingsphere.core.strategy.route.standard.StandardShardingStrategy;
|
||||
import org.apache.shardingsphere.shardingjdbc.api.ShardingDataSourceFactory;
|
||||
import org.codehaus.groovy.util.StringUtil;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
import java.sql.SQLException;
|
||||
import java.util.*;
|
||||
|
||||
|
||||
/**
|
||||
* sharding-jdbc 配置文件
|
||||
*/
|
||||
@Slf4j
|
||||
@Data
|
||||
@Configuration
|
||||
@ConfigurationProperties(prefix = "spring.shardingsphere")
|
||||
public class ShardingConfig {
|
||||
|
||||
/**
|
||||
* 读取数据源信息
|
||||
*/
|
||||
private Map<String, ShardingDataBase> datasource;
|
||||
/**
|
||||
* 读写分离的配置
|
||||
*/
|
||||
private Map<String, MasterSlaveRules> masterSlaveRules;
|
||||
/**
|
||||
* 显示sharding-jdbc的sql
|
||||
*/
|
||||
private String showSql;
|
||||
|
||||
/**
|
||||
* 广播表
|
||||
*/
|
||||
// private Set<String> broadcastTables;
|
||||
|
||||
/**
|
||||
* 中心库的节点
|
||||
*/
|
||||
private String centerTablesDataNode;
|
||||
|
||||
/**
|
||||
* 中心表,不进行分库操作
|
||||
*/
|
||||
private Set<String> centerTables;
|
||||
|
||||
/**
|
||||
* 区域库的节点
|
||||
*/
|
||||
private String regionTablesDataNode;
|
||||
|
||||
/**
|
||||
* 区域表分库策略的字段
|
||||
*/
|
||||
private String regionTablesShardingDatabaseColumn;
|
||||
|
||||
/**
|
||||
* 区域表分库的算法
|
||||
*/
|
||||
private String regionTablesShardingDatabaseAlgorithm;
|
||||
|
||||
/**
|
||||
* 分库表,通过userId进行分库
|
||||
*/
|
||||
private Set<String> regionTables;
|
||||
|
||||
|
||||
/**
|
||||
* 区域表分库策略的字段
|
||||
*/
|
||||
private String courseDetailsShardingDatabaseColumn;
|
||||
|
||||
/**
|
||||
* 区域表分库的算法
|
||||
*/
|
||||
private String courseDetailsShardingDatabaseAlgorithm;
|
||||
|
||||
/**
|
||||
* 分库表,通过userId进行分库
|
||||
*/
|
||||
private Set<String> courseDetails;
|
||||
|
||||
/**
|
||||
* 配置sharding-jdbc数据源
|
||||
*/
|
||||
@Bean
|
||||
public DataSource dataSource() throws SQLException {
|
||||
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
|
||||
|
||||
// 配置数据库主从
|
||||
shardingRuleConfig.setMasterSlaveRuleConfigs(masterSlaveRuleConfigs());
|
||||
|
||||
// 配置广播表
|
||||
// shardingRuleConfig.setBroadcastTables(broadcastTables);
|
||||
|
||||
// 配置表的切分策略
|
||||
shardingRuleConfig.setTableRuleConfigs(addTableRuleConfigs());
|
||||
|
||||
// 配置表绑定规则
|
||||
List<Set<String>> sets = new ArrayList<>();
|
||||
sets.add(regionTables);
|
||||
shardingRuleConfig.setBindingTableGroups(bindingTableGroups(sets));
|
||||
|
||||
|
||||
// 配置是否显示sql
|
||||
Properties props = new Properties();
|
||||
props.put("sql.show", showSql);
|
||||
|
||||
// 配置数据源
|
||||
Map<String, DataSource> dataSourceMap = getShardingDataBase();
|
||||
return ShardingDataSourceFactory.createDataSource(dataSourceMap, shardingRuleConfig, props);
|
||||
}
|
||||
|
||||
/**
|
||||
* 配置
|
||||
*/
|
||||
private Set<TableRuleConfiguration> addTableRuleConfigs() {
|
||||
Set<TableRuleConfiguration> sets = new HashSet<>();
|
||||
for (String centerTable : centerTables) {
|
||||
TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(centerTable,
|
||||
String.format(centerTablesDataNode, centerTable));
|
||||
sets.add(tableRuleConfig);
|
||||
}
|
||||
// 定义区域表的分库规则
|
||||
StandardShardingStrategyConfiguration databaseShardingStrategyConfig = new StandardShardingStrategyConfiguration(
|
||||
regionTablesShardingDatabaseColumn, new StandardShardingStrategyConf());
|
||||
// InlineShardingStrategyConfiguration databaseShardingStrategyConfig = new InlineShardingStrategyConfiguration(
|
||||
// regionTablesShardingDatabaseColumn, regionTablesShardingDatabaseAlgorithm);
|
||||
for (String regionTable : regionTables) {
|
||||
TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(regionTable, String.format(regionTablesDataNode, regionTable));
|
||||
tableRuleConfig.setDatabaseShardingStrategyConfig(databaseShardingStrategyConfig);
|
||||
sets.add(tableRuleConfig);
|
||||
}
|
||||
|
||||
|
||||
// 定义区域表的分库规则
|
||||
StandardShardingStrategyConfiguration courseDetailsShardingStrategyConfig = new StandardShardingStrategyConfiguration(
|
||||
courseDetailsShardingDatabaseColumn, new StandardShardingStrategyConf());
|
||||
for (String regionTable : courseDetails) {
|
||||
TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(regionTable, String.format(regionTablesDataNode, regionTable));
|
||||
tableRuleConfig.setDatabaseShardingStrategyConfig(courseDetailsShardingStrategyConfig);
|
||||
// 设置区域表使用雪花算法生成主键
|
||||
KeyGeneratorConfiguration keyGeneratorConfig = new KeyGeneratorConfiguration("SNOWFLAKE", "id");
|
||||
tableRuleConfig.setKeyGeneratorConfig(keyGeneratorConfig);
|
||||
|
||||
sets.add(tableRuleConfig);
|
||||
}
|
||||
return sets;
|
||||
}
|
||||
|
||||
/**
|
||||
* 配置数据源
|
||||
*/
|
||||
private Map<String, DataSource> getShardingDataBase() {
|
||||
String testQuery = "SELECT 1";
|
||||
Map<String, DataSource> map = new HashMap<>();
|
||||
datasource.forEach((datasourceName, shardingDataBase) -> {
|
||||
HikariConfig config = new HikariConfig();
|
||||
config.setDriverClassName(shardingDataBase.getDriverClassName());
|
||||
config.setJdbcUrl(shardingDataBase.getJdbcUrl());
|
||||
config.setUsername(shardingDataBase.getUsername());
|
||||
config.setPassword(shardingDataBase.getPassword());
|
||||
config.setPoolName(datasourceName);
|
||||
config.setMinimumIdle(shardingDataBase.getMinimumIdle());
|
||||
config.setMaximumPoolSize(shardingDataBase.getMaximumPoolSize());
|
||||
config.setIdleTimeout(shardingDataBase.getIdleTimeout());
|
||||
config.setMaxLifetime(shardingDataBase.getMaxLifetime());
|
||||
config.setConnectionTimeout(shardingDataBase.getConnectionTimeout());
|
||||
config.setConnectionTestQuery(testQuery);
|
||||
map.put(datasourceName, new HikariDataSource(config));
|
||||
});
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 配置读写分离
|
||||
*/
|
||||
private Set<MasterSlaveRuleConfiguration> masterSlaveRuleConfigs() {
|
||||
Set<MasterSlaveRuleConfiguration> sets = new HashSet<>();
|
||||
masterSlaveRules.forEach((databaseName, masterSlaveRules) -> {
|
||||
MasterSlaveRuleConfiguration masterSlaveRuleConfig = new MasterSlaveRuleConfiguration(databaseName,
|
||||
masterSlaveRules.getMasterDataSourceName(), masterSlaveRules.getSlaveDataSourceNames());
|
||||
sets.add(masterSlaveRuleConfig);
|
||||
});
|
||||
return sets;
|
||||
}
|
||||
|
||||
/**
|
||||
* 绑定表的分片规则
|
||||
*/
|
||||
public static Set<String> bindingTableGroups(List<Set<String>> sets) {
|
||||
if (sets != null && !sets.isEmpty()) {
|
||||
Set<String> tableGroups = new HashSet<>();
|
||||
for (Set<String> set : sets) {
|
||||
String tableNames = bindingTable(set.toArray(new String[0]));
|
||||
if (StringUtils.isNotBlank(tableNames)) {
|
||||
tableGroups.add(tableNames);
|
||||
}
|
||||
}
|
||||
return tableGroups;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量绑定表规则
|
||||
*
|
||||
* @param tables 批量绑定的标规则
|
||||
* @return tableNames
|
||||
*/
|
||||
private static String bindingTable(String... tables) {
|
||||
StringBuilder tableNames = new StringBuilder();
|
||||
if (tables != null && tables.length != 0) {
|
||||
for (String table : tables) {
|
||||
tableNames.append(table).append(",");
|
||||
}
|
||||
tableNames.deleteCharAt(tableNames.length() - 1);
|
||||
}
|
||||
return tableNames.toString();
|
||||
}
|
||||
}
|
||||
|
|
@ -41,7 +41,6 @@ public class ShiroConfig {
|
|||
shiroFilter.setFilters(filters);
|
||||
|
||||
Map<String, String> filterMap = new LinkedHashMap<>();
|
||||
filterMap.put("/uniCallBack/**", "anon");
|
||||
filterMap.put("/course/synCourse", "anon");
|
||||
filterMap.put("/webjars/**", "anon");
|
||||
filterMap.put("/druid/**", "anon");
|
||||
|
|
@ -50,7 +49,6 @@ public class ShiroConfig {
|
|||
filterMap.put("/banner/**", "anon");
|
||||
filterMap.put("/courseClassification/selectCourseClassification", "anon");
|
||||
filterMap.put("/sys/login", "anon");
|
||||
filterMap.put("/sys/registered", "anon");
|
||||
filterMap.put("/swagger/**", "anon");
|
||||
filterMap.put("/alioss/**", "anon");
|
||||
filterMap.put("/v2/api-docs", "anon");
|
||||
|
|
@ -59,8 +57,6 @@ public class ShiroConfig {
|
|||
filterMap.put("/captcha.jpg", "anon");
|
||||
filterMap.put("/aaa.txt", "anon");
|
||||
filterMap.put("/search/**", "anon");
|
||||
filterMap.put("/nsq/**", "anon");
|
||||
filterMap.put("/cashOutAudit/batchCashOutOrder", "anon");
|
||||
filterMap.put("/**", "oauth2");
|
||||
|
||||
shiroFilter.setFilterChainDefinitionMap(filterMap);
|
||||
|
|
|
|||
|
|
@ -1,114 +0,0 @@
|
|||
package com.sqx.config;
|
||||
|
||||
/**
|
||||
* 描述: Twitter的分布式自增ID雪花算法snowflake (Java版)
|
||||
**/
|
||||
public class SnowFlake {
|
||||
|
||||
/**
|
||||
* 起始的时间戳
|
||||
*/
|
||||
private final static long START_STMP = 1480166465631L;
|
||||
|
||||
/**
|
||||
* 每一部分占用的位数
|
||||
*/
|
||||
private final static long SEQUENCE_BIT = 12; //序列号占用的位数
|
||||
private final static long MACHINE_BIT = 5; //机器标识占用的位数
|
||||
private final static long DATACENTER_BIT = 5;//数据中心占用的位数
|
||||
|
||||
/**
|
||||
* 每一部分的最大值
|
||||
*/
|
||||
private final static long MAX_DATACENTER_NUM = ~(-1L << DATACENTER_BIT);
|
||||
private final static long MAX_MACHINE_NUM = ~(-1L << MACHINE_BIT);
|
||||
private final static long MAX_SEQUENCE = ~(-1L << SEQUENCE_BIT);
|
||||
|
||||
/**
|
||||
* 每一部分向左的位移
|
||||
*/
|
||||
private final static long MACHINE_LEFT = SEQUENCE_BIT;
|
||||
private final static long DATACENTER_LEFT = SEQUENCE_BIT + MACHINE_BIT;
|
||||
private final static long TIMESTMP_LEFT = DATACENTER_LEFT + DATACENTER_BIT;
|
||||
|
||||
/**
|
||||
* 数据中心
|
||||
*/
|
||||
private long datacenterId;
|
||||
/**
|
||||
* 机器标识
|
||||
*/
|
||||
private long machineId;
|
||||
/**
|
||||
* 代表了一毫秒内生成的多个id的最新序号
|
||||
*/
|
||||
private long sequence = 10000L;
|
||||
/**
|
||||
* 上一次时间戳
|
||||
*/
|
||||
private long lastStmp = -1L;
|
||||
|
||||
public SnowFlake() {
|
||||
}
|
||||
|
||||
public SnowFlake(long datacenterId, long machineId) {
|
||||
if (datacenterId > MAX_DATACENTER_NUM || datacenterId < 0) {
|
||||
throw new IllegalArgumentException("datacenterId can't be greater than MAX_DATACENTER_NUM or less than 0");
|
||||
}
|
||||
if (machineId > MAX_MACHINE_NUM || machineId < 0) {
|
||||
throw new IllegalArgumentException("machineId can't be greater than MAX_MACHINE_NUM or less than 0");
|
||||
}
|
||||
this.datacenterId = datacenterId;
|
||||
this.machineId = machineId;
|
||||
}
|
||||
|
||||
/**
|
||||
* 产生下一个ID
|
||||
*
|
||||
* @param ifEvenNum 是否偶数 true 时间不连续全是偶数 时间连续 奇数偶数 false 时间不连续 奇偶都有 所以一般建议用false
|
||||
*/
|
||||
public synchronized long nextId(boolean ifEvenNum) {
|
||||
long currStmp = getNewstmp();
|
||||
if (currStmp < lastStmp) {
|
||||
throw new RuntimeException("Clock moved backwards. Refusing to generate id");
|
||||
}
|
||||
/**
|
||||
* 时间不连续出来全是偶数
|
||||
*/
|
||||
if (ifEvenNum) {
|
||||
if (currStmp == lastStmp) {
|
||||
//相同毫秒内,序列号自增
|
||||
sequence = (sequence + 1) & MAX_SEQUENCE;
|
||||
//同一毫秒的序列数已经达到最大
|
||||
if (sequence == 0L) {
|
||||
currStmp = getNextMill();
|
||||
}
|
||||
} else {
|
||||
//不同毫秒内,序列号置为0
|
||||
sequence = 0L;
|
||||
}
|
||||
} else {
|
||||
//相同毫秒内,序列号自增
|
||||
sequence = (sequence + 1) & MAX_SEQUENCE;
|
||||
}
|
||||
|
||||
lastStmp = currStmp;
|
||||
|
||||
return (currStmp - START_STMP) << TIMESTMP_LEFT //时间戳部分
|
||||
| datacenterId << DATACENTER_LEFT //数据中心部分
|
||||
| machineId << MACHINE_LEFT //机器标识部分
|
||||
| sequence; //序列号部分
|
||||
}
|
||||
|
||||
private long getNextMill() {
|
||||
long mill = getNewstmp();
|
||||
while (mill <= lastStmp) {
|
||||
mill = getNewstmp();
|
||||
}
|
||||
return mill;
|
||||
}
|
||||
|
||||
private long getNewstmp() {
|
||||
return System.currentTimeMillis();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
package com.sqx.config;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
@Configuration
|
||||
public class SnowFlakeConfig {
|
||||
/**
|
||||
* 数据中心
|
||||
*/
|
||||
@Value("${snowflake.datacenterId}")
|
||||
private String datacenterId;
|
||||
/**
|
||||
* 机器标识
|
||||
*/
|
||||
@Value("${snowflake.machineId}")
|
||||
private String machineId;
|
||||
|
||||
@Bean(name = "snowFlake")
|
||||
public SnowFlake snowFlake() {
|
||||
return new SnowFlake(Long.parseLong(datacenterId), Long.parseLong(machineId));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,85 +1,53 @@
|
|||
//package com.sqx.config;
|
||||
//
|
||||
//import io.swagger.annotations.Api;
|
||||
//import io.swagger.annotations.ApiOperation;
|
||||
//import org.springframework.beans.factory.annotation.Value;
|
||||
//import org.springframework.context.annotation.Bean;
|
||||
//import org.springframework.context.annotation.Configuration;
|
||||
//import org.springframework.context.annotation.Profile;
|
||||
//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
//import springfox.documentation.builders.ApiInfoBuilder;
|
||||
//import springfox.documentation.builders.PathSelectors;
|
||||
//import springfox.documentation.builders.RequestHandlerSelectors;
|
||||
//import springfox.documentation.service.ApiInfo;
|
||||
//import springfox.documentation.service.ApiKey;
|
||||
//import springfox.documentation.spi.DocumentationType;
|
||||
//import springfox.documentation.spring.web.plugins.Docket;
|
||||
//import springfox.documentation.swagger2.annotations.EnableSwagger2;
|
||||
//
|
||||
//import java.util.List;
|
||||
//
|
||||
//import static com.google.common.collect.Lists.newArrayList;
|
||||
//
|
||||
////@Configuration
|
||||
////@EnableSwagger2
|
||||
////public class SwaggerConfig implements WebMvcConfigurer {
|
||||
////
|
||||
//// @Value("${swagger.enabled}")
|
||||
//// private boolean enabled;
|
||||
////
|
||||
//// @Bean
|
||||
//// public Docket createRestApi() {
|
||||
//// return new Docket(DocumentationType.SWAGGER_2)
|
||||
//// .enable(enabled)
|
||||
//// .apiInfo(apiInfo())
|
||||
//// .select()
|
||||
//// //加了ApiOperation注解的类,才生成接口文档
|
||||
//// .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
|
||||
//// //包下的类,才生成接口文档
|
||||
//// //.apis(RequestHandlerSelectors.basePackage("com.sqx.controller"))
|
||||
//// .paths(PathSelectors.any())
|
||||
//// .build()
|
||||
//// .securitySchemes(security());
|
||||
//// }
|
||||
////
|
||||
//// private ApiInfo apiInfo() {
|
||||
//// return new ApiInfoBuilder()
|
||||
//// .title("")
|
||||
//// .description("sqx-fast文档")
|
||||
//// .termsOfServiceUrl("")
|
||||
//// .version("3.0.0")
|
||||
//// .build();
|
||||
//// }
|
||||
////
|
||||
//// private List<ApiKey> security() {
|
||||
//// return newArrayList(
|
||||
//// new ApiKey("token", "token", "header")
|
||||
//// );
|
||||
//// }
|
||||
////
|
||||
////}
|
||||
//
|
||||
//@Configuration
|
||||
//@EnableSwagger2
|
||||
//@Profile({"local", "dev"})
|
||||
//public class SwaggerConfig {
|
||||
//
|
||||
// @Bean
|
||||
// public Docket api() {
|
||||
// return new Docket(DocumentationType.SWAGGER_2)
|
||||
// .apiInfo(apiInfo())
|
||||
// .select()
|
||||
// .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
|
||||
// .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
|
||||
// .paths(PathSelectors.any())
|
||||
// .build();
|
||||
// }
|
||||
//
|
||||
// private ApiInfo apiInfo() {
|
||||
// return new ApiInfoBuilder()
|
||||
// .title("悠车位后台API接口文档")
|
||||
// .description("悠车位服务端后台API接口文档")
|
||||
// .version("1.0")
|
||||
// .build();
|
||||
// }
|
||||
//}
|
||||
package com.sqx.config;
|
||||
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
import springfox.documentation.builders.ApiInfoBuilder;
|
||||
import springfox.documentation.builders.PathSelectors;
|
||||
import springfox.documentation.builders.RequestHandlerSelectors;
|
||||
import springfox.documentation.service.ApiInfo;
|
||||
import springfox.documentation.service.ApiKey;
|
||||
import springfox.documentation.spi.DocumentationType;
|
||||
import springfox.documentation.spring.web.plugins.Docket;
|
||||
import springfox.documentation.swagger2.annotations.EnableSwagger2;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static com.google.common.collect.Lists.newArrayList;
|
||||
|
||||
@Configuration
|
||||
@EnableSwagger2
|
||||
public class SwaggerConfig implements WebMvcConfigurer {
|
||||
|
||||
@Bean
|
||||
public Docket createRestApi() {
|
||||
return new Docket(DocumentationType.SWAGGER_2)
|
||||
.apiInfo(apiInfo())
|
||||
.select()
|
||||
//加了ApiOperation注解的类,才生成接口文档
|
||||
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
|
||||
//包下的类,才生成接口文档
|
||||
//.apis(RequestHandlerSelectors.basePackage("com.sqx.controller"))
|
||||
.paths(PathSelectors.any())
|
||||
.build()
|
||||
.securitySchemes(security());
|
||||
}
|
||||
|
||||
private ApiInfo apiInfo() {
|
||||
return new ApiInfoBuilder()
|
||||
.title("")
|
||||
.description("sqx-fast文档")
|
||||
.termsOfServiceUrl("")
|
||||
.version("3.0.0")
|
||||
.build();
|
||||
}
|
||||
|
||||
private List<ApiKey> security() {
|
||||
return newArrayList(
|
||||
new ApiKey("token", "token", "header")
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
package com.sqx.datasource.annotation;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
/**
|
||||
* 多数据源注解
|
||||
*/
|
||||
@Target({ElementType.METHOD, ElementType.TYPE})
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Documented
|
||||
@Inherited
|
||||
public @interface DataSource {
|
||||
String value() default "";
|
||||
}
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
package com.sqx.datasource.aspect;
|
||||
|
||||
|
||||
import com.sqx.datasource.annotation.DataSource;
|
||||
import com.sqx.datasource.config.DynamicContextHolder;
|
||||
import org.aspectj.lang.ProceedingJoinPoint;
|
||||
import org.aspectj.lang.annotation.Around;
|
||||
import org.aspectj.lang.annotation.Aspect;
|
||||
import org.aspectj.lang.annotation.Pointcut;
|
||||
import org.aspectj.lang.reflect.MethodSignature;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.core.Ordered;
|
||||
import org.springframework.core.annotation.Order;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
/**
|
||||
* 多数据源,切面处理类
|
||||
*/
|
||||
@Aspect
|
||||
@Component
|
||||
@Order(Ordered.HIGHEST_PRECEDENCE)
|
||||
public class DataSourceAspect {
|
||||
protected Logger logger = LoggerFactory.getLogger(getClass());
|
||||
|
||||
@Pointcut("@annotation(com.sqx.datasource.annotation.DataSource) " +
|
||||
"|| @within(com.sqx.datasource.annotation.DataSource)")
|
||||
public void dataSourcePointCut() {
|
||||
|
||||
}
|
||||
|
||||
@Around("dataSourcePointCut()")
|
||||
public Object around(ProceedingJoinPoint point) throws Throwable {
|
||||
MethodSignature signature = (MethodSignature) point.getSignature();
|
||||
Class targetClass = point.getTarget().getClass();
|
||||
Method method = signature.getMethod();
|
||||
|
||||
DataSource targetDataSource = (DataSource)targetClass.getAnnotation(DataSource.class);
|
||||
DataSource methodDataSource = method.getAnnotation(DataSource.class);
|
||||
if(targetDataSource != null || methodDataSource != null){
|
||||
String value;
|
||||
if(methodDataSource != null){
|
||||
value = methodDataSource.value();
|
||||
}else {
|
||||
value = targetDataSource.value();
|
||||
}
|
||||
|
||||
DynamicContextHolder.push(value);
|
||||
logger.debug("set datasource is {}", value);
|
||||
}
|
||||
|
||||
try {
|
||||
return point.proceed();
|
||||
} finally {
|
||||
DynamicContextHolder.poll();
|
||||
logger.debug("clean datasource");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
package com.sqx.datasource.config;
|
||||
|
||||
import java.util.ArrayDeque;
|
||||
import java.util.Deque;
|
||||
|
||||
/**
|
||||
* 多数据源上下文
|
||||
*/
|
||||
public class DynamicContextHolder {
|
||||
@SuppressWarnings("unchecked")
|
||||
private static final ThreadLocal<Deque<String>> CONTEXT_HOLDER = new ThreadLocal() {
|
||||
@Override
|
||||
protected Object initialValue() {
|
||||
return new ArrayDeque();
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 获得当前线程数据源
|
||||
*
|
||||
* @return 数据源名称
|
||||
*/
|
||||
public static String peek() {
|
||||
return CONTEXT_HOLDER.get().peek();
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置当前线程数据源
|
||||
*
|
||||
* @param dataSource 数据源名称
|
||||
*/
|
||||
public static void push(String dataSource) {
|
||||
CONTEXT_HOLDER.get().push(dataSource);
|
||||
}
|
||||
|
||||
/**
|
||||
* 清空当前线程数据源
|
||||
*/
|
||||
public static void poll() {
|
||||
Deque<String> deque = CONTEXT_HOLDER.get();
|
||||
deque.poll();
|
||||
if (deque.isEmpty()) {
|
||||
CONTEXT_HOLDER.remove();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
package com.sqx.datasource.config;
|
||||
|
||||
import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
|
||||
|
||||
/**
|
||||
* 多数据源
|
||||
*/
|
||||
public class DynamicDataSource extends AbstractRoutingDataSource {
|
||||
|
||||
@Override
|
||||
protected Object determineCurrentLookupKey() {
|
||||
return DynamicContextHolder.peek();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
package com.sqx.datasource.config;
|
||||
|
||||
import com.alibaba.druid.pool.DruidDataSource;
|
||||
import com.sqx.datasource.properties.DataSourceProperties;
|
||||
import com.sqx.datasource.properties.DynamicDataSourceProperties;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 配置多数据源
|
||||
*/
|
||||
@Configuration
|
||||
@EnableConfigurationProperties(DynamicDataSourceProperties.class)
|
||||
public class DynamicDataSourceConfig {
|
||||
@Autowired
|
||||
private DynamicDataSourceProperties properties;
|
||||
|
||||
@Bean
|
||||
@ConfigurationProperties(prefix = "spring.datasource.druid")
|
||||
public DataSourceProperties dataSourceProperties() {
|
||||
return new DataSourceProperties();
|
||||
}
|
||||
|
||||
@Bean
|
||||
public DynamicDataSource dynamicDataSource(DataSourceProperties dataSourceProperties) {
|
||||
DynamicDataSource dynamicDataSource = new DynamicDataSource();
|
||||
dynamicDataSource.setTargetDataSources(getDynamicDataSource());
|
||||
|
||||
//默认数据源
|
||||
DruidDataSource defaultDataSource = DynamicDataSourceFactory.buildDruidDataSource(dataSourceProperties);
|
||||
dynamicDataSource.setDefaultTargetDataSource(defaultDataSource);
|
||||
|
||||
return dynamicDataSource;
|
||||
}
|
||||
|
||||
private Map<Object, Object> getDynamicDataSource(){
|
||||
Map<String, DataSourceProperties> dataSourcePropertiesMap = properties.getDatasource();
|
||||
Map<Object, Object> targetDataSources = new HashMap<>(dataSourcePropertiesMap.size());
|
||||
dataSourcePropertiesMap.forEach((k, v) -> {
|
||||
DruidDataSource druidDataSource = DynamicDataSourceFactory.buildDruidDataSource(v);
|
||||
targetDataSources.put(k, druidDataSource);
|
||||
});
|
||||
|
||||
return targetDataSources;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
package com.sqx.datasource.config;
|
||||
|
||||
import com.alibaba.druid.pool.DruidDataSource;
|
||||
import com.sqx.datasource.properties.DataSourceProperties;
|
||||
|
||||
import java.sql.SQLException;
|
||||
|
||||
/**
|
||||
* DruidDataSource
|
||||
*
|
||||
*/
|
||||
public class DynamicDataSourceFactory {
|
||||
|
||||
public static DruidDataSource buildDruidDataSource(DataSourceProperties properties) {
|
||||
DruidDataSource druidDataSource = new DruidDataSource();
|
||||
druidDataSource.setDriverClassName(properties.getDriverClassName());
|
||||
druidDataSource.setUrl(properties.getUrl());
|
||||
druidDataSource.setUsername(properties.getUsername());
|
||||
druidDataSource.setPassword(properties.getPassword());
|
||||
|
||||
druidDataSource.setInitialSize(properties.getInitialSize());
|
||||
druidDataSource.setMaxActive(properties.getMaxActive());
|
||||
druidDataSource.setMinIdle(properties.getMinIdle());
|
||||
druidDataSource.setMaxWait(properties.getMaxWait());
|
||||
druidDataSource.setTimeBetweenEvictionRunsMillis(properties.getTimeBetweenEvictionRunsMillis());
|
||||
druidDataSource.setMinEvictableIdleTimeMillis(properties.getMinEvictableIdleTimeMillis());
|
||||
druidDataSource.setMaxEvictableIdleTimeMillis(properties.getMaxEvictableIdleTimeMillis());
|
||||
druidDataSource.setValidationQuery(properties.getValidationQuery());
|
||||
druidDataSource.setValidationQueryTimeout(properties.getValidationQueryTimeout());
|
||||
druidDataSource.setTestOnBorrow(properties.isTestOnBorrow());
|
||||
druidDataSource.setTestOnReturn(properties.isTestOnReturn());
|
||||
druidDataSource.setPoolPreparedStatements(properties.isPoolPreparedStatements());
|
||||
druidDataSource.setMaxOpenPreparedStatements(properties.getMaxOpenPreparedStatements());
|
||||
druidDataSource.setSharePreparedStatements(properties.isSharePreparedStatements());
|
||||
|
||||
try {
|
||||
druidDataSource.setFilters(properties.getFilters());
|
||||
druidDataSource.init();
|
||||
} catch (SQLException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return druidDataSource;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,192 @@
|
|||
package com.sqx.datasource.properties;
|
||||
|
||||
/**
|
||||
* 多数据源属性
|
||||
*
|
||||
*/
|
||||
public class DataSourceProperties {
|
||||
private String driverClassName;
|
||||
private String url;
|
||||
private String username;
|
||||
private String password;
|
||||
|
||||
/**
|
||||
* Druid默认参数
|
||||
*/
|
||||
private int initialSize = 2;
|
||||
private int maxActive = 10;
|
||||
private int minIdle = -1;
|
||||
private long maxWait = 60 * 1000L;
|
||||
private long timeBetweenEvictionRunsMillis = 60 * 1000L;
|
||||
private long minEvictableIdleTimeMillis = 1000L * 60L * 30L;
|
||||
private long maxEvictableIdleTimeMillis = 1000L * 60L * 60L * 7;
|
||||
private String validationQuery = "select 1";
|
||||
private int validationQueryTimeout = -1;
|
||||
private boolean testOnBorrow = false;
|
||||
private boolean testOnReturn = false;
|
||||
private boolean testWhileIdle = true;
|
||||
private boolean poolPreparedStatements = false;
|
||||
private int maxOpenPreparedStatements = -1;
|
||||
private boolean sharePreparedStatements = false;
|
||||
private String filters = "stat,wall";
|
||||
|
||||
public String getDriverClassName() {
|
||||
return driverClassName;
|
||||
}
|
||||
|
||||
public void setDriverClassName(String driverClassName) {
|
||||
this.driverClassName = driverClassName;
|
||||
}
|
||||
|
||||
public String getUrl() {
|
||||
return url;
|
||||
}
|
||||
|
||||
public void setUrl(String url) {
|
||||
this.url = url;
|
||||
}
|
||||
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public String getPassword() {
|
||||
return password;
|
||||
}
|
||||
|
||||
public void setPassword(String password) {
|
||||
this.password = password;
|
||||
}
|
||||
|
||||
public int getInitialSize() {
|
||||
return initialSize;
|
||||
}
|
||||
|
||||
public void setInitialSize(int initialSize) {
|
||||
this.initialSize = initialSize;
|
||||
}
|
||||
|
||||
public int getMaxActive() {
|
||||
return maxActive;
|
||||
}
|
||||
|
||||
public void setMaxActive(int maxActive) {
|
||||
this.maxActive = maxActive;
|
||||
}
|
||||
|
||||
public int getMinIdle() {
|
||||
return minIdle;
|
||||
}
|
||||
|
||||
public void setMinIdle(int minIdle) {
|
||||
this.minIdle = minIdle;
|
||||
}
|
||||
|
||||
public long getMaxWait() {
|
||||
return maxWait;
|
||||
}
|
||||
|
||||
public void setMaxWait(long maxWait) {
|
||||
this.maxWait = maxWait;
|
||||
}
|
||||
|
||||
public long getTimeBetweenEvictionRunsMillis() {
|
||||
return timeBetweenEvictionRunsMillis;
|
||||
}
|
||||
|
||||
public void setTimeBetweenEvictionRunsMillis(long timeBetweenEvictionRunsMillis) {
|
||||
this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis;
|
||||
}
|
||||
|
||||
public long getMinEvictableIdleTimeMillis() {
|
||||
return minEvictableIdleTimeMillis;
|
||||
}
|
||||
|
||||
public void setMinEvictableIdleTimeMillis(long minEvictableIdleTimeMillis) {
|
||||
this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
|
||||
}
|
||||
|
||||
public long getMaxEvictableIdleTimeMillis() {
|
||||
return maxEvictableIdleTimeMillis;
|
||||
}
|
||||
|
||||
public void setMaxEvictableIdleTimeMillis(long maxEvictableIdleTimeMillis) {
|
||||
this.maxEvictableIdleTimeMillis = maxEvictableIdleTimeMillis;
|
||||
}
|
||||
|
||||
public String getValidationQuery() {
|
||||
return validationQuery;
|
||||
}
|
||||
|
||||
public void setValidationQuery(String validationQuery) {
|
||||
this.validationQuery = validationQuery;
|
||||
}
|
||||
|
||||
public int getValidationQueryTimeout() {
|
||||
return validationQueryTimeout;
|
||||
}
|
||||
|
||||
public void setValidationQueryTimeout(int validationQueryTimeout) {
|
||||
this.validationQueryTimeout = validationQueryTimeout;
|
||||
}
|
||||
|
||||
public boolean isTestOnBorrow() {
|
||||
return testOnBorrow;
|
||||
}
|
||||
|
||||
public void setTestOnBorrow(boolean testOnBorrow) {
|
||||
this.testOnBorrow = testOnBorrow;
|
||||
}
|
||||
|
||||
public boolean isTestOnReturn() {
|
||||
return testOnReturn;
|
||||
}
|
||||
|
||||
public void setTestOnReturn(boolean testOnReturn) {
|
||||
this.testOnReturn = testOnReturn;
|
||||
}
|
||||
|
||||
public boolean isTestWhileIdle() {
|
||||
return testWhileIdle;
|
||||
}
|
||||
|
||||
public void setTestWhileIdle(boolean testWhileIdle) {
|
||||
this.testWhileIdle = testWhileIdle;
|
||||
}
|
||||
|
||||
public boolean isPoolPreparedStatements() {
|
||||
return poolPreparedStatements;
|
||||
}
|
||||
|
||||
public void setPoolPreparedStatements(boolean poolPreparedStatements) {
|
||||
this.poolPreparedStatements = poolPreparedStatements;
|
||||
}
|
||||
|
||||
public int getMaxOpenPreparedStatements() {
|
||||
return maxOpenPreparedStatements;
|
||||
}
|
||||
|
||||
public void setMaxOpenPreparedStatements(int maxOpenPreparedStatements) {
|
||||
this.maxOpenPreparedStatements = maxOpenPreparedStatements;
|
||||
}
|
||||
|
||||
public boolean isSharePreparedStatements() {
|
||||
return sharePreparedStatements;
|
||||
}
|
||||
|
||||
public void setSharePreparedStatements(boolean sharePreparedStatements) {
|
||||
this.sharePreparedStatements = sharePreparedStatements;
|
||||
}
|
||||
|
||||
public String getFilters() {
|
||||
return filters;
|
||||
}
|
||||
|
||||
public void setFilters(String filters) {
|
||||
this.filters = filters;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
package com.sqx.datasource.properties;
|
||||
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 多数据源属性
|
||||
*/
|
||||
@ConfigurationProperties(prefix = "dynamic")
|
||||
public class DynamicDataSourceProperties {
|
||||
private Map<String, DataSourceProperties> datasource = new LinkedHashMap<>();
|
||||
|
||||
public Map<String, DataSourceProperties> getDatasource() {
|
||||
return datasource;
|
||||
}
|
||||
|
||||
public void setDatasource(Map<String, DataSourceProperties> datasource) {
|
||||
this.datasource = datasource;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
package com.sqx.modules.announcement.controller;
|
||||
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.announcement.service.AnnouncementService;
|
||||
import com.sqx.modules.common.dto.AddAnnouncementDTO;
|
||||
import com.sqx.modules.common.dto.DeleteAnnouncementDTO;
|
||||
import com.sqx.modules.common.dto.UpdateAnnouncementDTO;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/announcement")
|
||||
public class AnnouncementController {
|
||||
|
||||
private final AnnouncementService announcementService;
|
||||
|
||||
public AnnouncementController(AnnouncementService announcementService) {
|
||||
this.announcementService = announcementService;
|
||||
}
|
||||
|
||||
@GetMapping("/list")
|
||||
public Result list(@RequestParam(required = false) String title, @RequestParam(required = false) Integer state, @RequestParam(required = false) Integer id) {
|
||||
return Result.success().put("data", announcementService.listInfo(title, state, id));
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public Result add(@RequestBody @Validated AddAnnouncementDTO announcementDTO) {
|
||||
return Result.success().put("data", announcementService.add(announcementDTO));
|
||||
}
|
||||
|
||||
@PutMapping
|
||||
public Result update(@RequestBody @Validated UpdateAnnouncementDTO updateAnnouncementDTO) {
|
||||
return Result.success().put("data", announcementService.updateInfo(updateAnnouncementDTO));
|
||||
}
|
||||
|
||||
@DeleteMapping
|
||||
public Result delete(@RequestBody @Validated DeleteAnnouncementDTO deleteAnnouncementDTO) {
|
||||
return Result.success().put("data", announcementService.removeById(deleteAnnouncementDTO.getId()));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
package com.sqx.modules.announcement.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 公告表
|
||||
* @TableName announcement
|
||||
*/
|
||||
@TableName(value ="announcement")
|
||||
@Data
|
||||
public class Announcement implements Serializable {
|
||||
/**
|
||||
*
|
||||
*/
|
||||
// @TableId
|
||||
private Integer id;
|
||||
|
||||
/**
|
||||
* 标题
|
||||
*/
|
||||
private String title;
|
||||
|
||||
/**
|
||||
* 内容
|
||||
*/
|
||||
private String content;
|
||||
|
||||
/**
|
||||
* 状态0关闭 1打开
|
||||
*/
|
||||
private Integer state;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
private Date updateTime;
|
||||
|
||||
@TableField(exist = false)
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Override
|
||||
public boolean equals(Object that) {
|
||||
if (this == that) {
|
||||
return true;
|
||||
}
|
||||
if (that == null) {
|
||||
return false;
|
||||
}
|
||||
if (getClass() != that.getClass()) {
|
||||
return false;
|
||||
}
|
||||
Announcement other = (Announcement) that;
|
||||
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
|
||||
&& (this.getTitle() == null ? other.getTitle() == null : this.getTitle().equals(other.getTitle()))
|
||||
&& (this.getContent() == null ? other.getContent() == null : this.getContent().equals(other.getContent()))
|
||||
&& (this.getState() == null ? other.getState() == null : this.getState().equals(other.getState()))
|
||||
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
|
||||
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
|
||||
result = prime * result + ((getTitle() == null) ? 0 : getTitle().hashCode());
|
||||
result = prime * result + ((getContent() == null) ? 0 : getContent().hashCode());
|
||||
result = prime * result + ((getState() == null) ? 0 : getState().hashCode());
|
||||
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
|
||||
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append(getClass().getSimpleName());
|
||||
sb.append(" [");
|
||||
sb.append("Hash = ").append(hashCode());
|
||||
sb.append(", id=").append(id);
|
||||
sb.append(", title=").append(title);
|
||||
sb.append(", content=").append(content);
|
||||
sb.append(", state=").append(state);
|
||||
sb.append(", createTime=").append(createTime);
|
||||
sb.append(", updateTime=").append(updateTime);
|
||||
sb.append(", serialVersionUID=").append(serialVersionUID);
|
||||
sb.append("]");
|
||||
return sb.toString();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
package com.sqx.modules.announcement.mapper;
|
||||
|
||||
import com.sqx.modules.announcement.entity.Announcement;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @author Administrator
|
||||
* @description 针对表【announcement(公告表)】的数据库操作Mapper
|
||||
* @createDate 2025-01-02 14:33:44
|
||||
* @Entity com.sqx.modules.announcement.entity.Announcement
|
||||
*/
|
||||
@Mapper
|
||||
public interface AnnouncementMapper extends BaseMapper<Announcement> {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
package com.sqx.modules.announcement.service;
|
||||
|
||||
import com.sqx.modules.announcement.entity.Announcement;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.sqx.modules.common.dto.AddAnnouncementDTO;
|
||||
import com.sqx.modules.common.dto.DeleteAnnouncementDTO;
|
||||
import com.sqx.modules.common.dto.UpdateAnnouncementDTO;
|
||||
|
||||
/**
|
||||
* @author Administrator
|
||||
* @description 针对表【announcement(公告表)】的数据库操作Service
|
||||
* @createDate 2025-01-02 14:33:44
|
||||
*/
|
||||
public interface AnnouncementService extends IService<Announcement> {
|
||||
|
||||
Object add(AddAnnouncementDTO announcementDTO);
|
||||
|
||||
Object updateInfo(UpdateAnnouncementDTO updateAnnouncementDTO);
|
||||
|
||||
Object listInfo(String title, Integer state, Integer id);
|
||||
|
||||
}
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
package com.sqx.modules.announcement.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.sqx.common.exception.SqxException;
|
||||
import com.sqx.modules.announcement.entity.Announcement;
|
||||
import com.sqx.modules.announcement.service.AnnouncementService;
|
||||
import com.sqx.modules.announcement.mapper.AnnouncementMapper;
|
||||
import com.sqx.modules.common.dto.AddAnnouncementDTO;
|
||||
import com.sqx.modules.common.dto.UpdateAnnouncementDTO;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* @author Administrator
|
||||
* @description 针对表【announcement(公告表)】的数据库操作Service实现
|
||||
* @createDate 2025-01-02 14:33:44
|
||||
*/
|
||||
@Service
|
||||
public class AnnouncementServiceImpl extends ServiceImpl<AnnouncementMapper, Announcement>
|
||||
implements AnnouncementService{
|
||||
|
||||
@Override
|
||||
public Object listInfo(String title, Integer state, Integer id) {
|
||||
LambdaQueryWrapper<Announcement> queryWrapper = new LambdaQueryWrapper<>();
|
||||
boolean flag = false;
|
||||
if (StrUtil.isNotBlank(title)) {
|
||||
queryWrapper.like(Announcement::getTitle, title);
|
||||
flag = true;
|
||||
}
|
||||
if (state != null) {
|
||||
queryWrapper.eq(Announcement::getState, state);
|
||||
flag = true;
|
||||
}
|
||||
if (id != null) {
|
||||
queryWrapper.eq(Announcement::getId, id);
|
||||
}
|
||||
return flag ? list(queryWrapper) : list();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object add(AddAnnouncementDTO announcementDTO) {
|
||||
Announcement announcement = new Announcement();
|
||||
BeanUtil.copyProperties(announcementDTO, announcement);
|
||||
announcement.setCreateTime(DateUtil.date());
|
||||
return save(announcement);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object updateInfo(UpdateAnnouncementDTO updateAnnouncementDTO) {
|
||||
Announcement announcement = getById(updateAnnouncementDTO.getId());
|
||||
if (announcement == null) {
|
||||
throw new SqxException("公告不存在");
|
||||
}
|
||||
BeanUtil.copyProperties(updateAnnouncementDTO, announcement);
|
||||
announcement.setUpdateTime(DateUtil.date());
|
||||
return updateById(announcement);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
package com.sqx.modules.app.controller;
|
||||
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.entity.App;
|
||||
import com.sqx.modules.app.service.AppService;
|
||||
|
|
@ -14,7 +13,6 @@ import org.springframework.web.bind.annotation.*;
|
|||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* APP登录授权
|
||||
|
|
@ -32,10 +30,8 @@ public class AppUpgradeController {
|
|||
@ApiOperation("管理平台升级详情")
|
||||
@ResponseBody
|
||||
public Result list(Integer page,Integer limit) {
|
||||
PageHelper.startPage(page,limit);
|
||||
List<App> list = iAppService.list();
|
||||
PageInfo<App> pageInfo = new PageInfo<>(list);
|
||||
return Result.success().put("data", PageUtils.page(pageInfo, true));
|
||||
IPage<App> pages =new Page<>(page,limit);
|
||||
return Result.success().put("data",iAppService.page(pages));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,54 +0,0 @@
|
|||
package com.sqx.modules.app.controller;
|
||||
|
||||
import com.sqx.common.utils.Constant;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.annotation.Login;
|
||||
import com.sqx.modules.app.entity.UserPrizeExchange;
|
||||
import com.sqx.modules.app.service.UserPrizeExchangeService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiImplicitParams;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import springfox.documentation.annotations.ApiIgnore;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/app/userPrizeExchange")
|
||||
@AllArgsConstructor
|
||||
@Api(value = "用户奖品兑换", tags = {"用户奖品兑换"})
|
||||
public class AppUserPrizeExchangeController {
|
||||
private final UserPrizeExchangeService userPrizeExchangeService;
|
||||
|
||||
@Login
|
||||
@GetMapping("/page")
|
||||
@ApiOperation("分页")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码,从1开始", paramType = "query", required = true, dataType = "int"),
|
||||
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
|
||||
})
|
||||
public Result page(@RequestAttribute("userId") Long userId, @ApiIgnore @RequestParam Map<String, Object> params) {
|
||||
params.put("userId", userId);
|
||||
PageUtils page = userPrizeExchangeService.page(params);
|
||||
return Result.success().put("page", page);
|
||||
}
|
||||
|
||||
@Login
|
||||
@PostMapping("/exchange")
|
||||
@ApiOperation("兑换")
|
||||
public Result exchange(@RequestAttribute("userId") Long userId, @RequestBody UserPrizeExchange entity) {
|
||||
userPrizeExchangeService.exchange(userId, entity);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
@Login
|
||||
@PostMapping("/receive")
|
||||
@ApiOperation("领取满签奖励")
|
||||
public Result receive(@RequestAttribute("userId") Long userId) {
|
||||
userPrizeExchangeService.receive(userId);
|
||||
return Result.success();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package com.sqx.modules.app.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.entity.UserEntity;
|
||||
|
|
@ -23,7 +23,6 @@ import com.sqx.modules.pay.service.PayDetailsService;
|
|||
import com.sqx.modules.sys.entity.SysUserEntity;
|
||||
import com.sqx.modules.sys.service.SysUserService;
|
||||
import com.sqx.modules.utils.EasyPoi.ExcelUtils;
|
||||
import com.sqx.modules.utils.TimeCompleteUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
|
|
@ -75,7 +74,7 @@ public class UserController {
|
|||
public Result selectUserByInvitationCode(String invitationCode) {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
UserEntity userEntity = userService.queryByInvitationCode(invitationCode);
|
||||
Long userId = userEntity.getUserId();
|
||||
Long userId=userEntity.getUserId();
|
||||
//查询用户钱包
|
||||
// Double money = cashOutDao.selectMayMoney(userId);
|
||||
InviteMoney inviteMoney = inviteMoneyService.selectInviteMoneyByUserId(userId);
|
||||
|
|
@ -89,7 +88,7 @@ public class UserController {
|
|||
//查询邀请人数
|
||||
int count = userService.queryInviterCount(userEntity.getInvitationCode());
|
||||
UserVip userVip = userVipService.selectUserVipByUserId(userId);
|
||||
if (userVip != null) {
|
||||
if(userVip!=null){
|
||||
userEntity.setMember(userVip.getIsVip());
|
||||
userEntity.setEndTime(userVip.getEndTime());
|
||||
userEntity.setVipType(userVip.getVipType());
|
||||
|
|
@ -121,7 +120,7 @@ public class UserController {
|
|||
//查询邀请人数
|
||||
int count = userService.queryInviterCount(userEntity.getInvitationCode());
|
||||
UserVip userVip = userVipService.selectUserVipByUserId(userId);
|
||||
if (userVip != null) {
|
||||
if(userVip!=null){
|
||||
userEntity.setMember(userVip.getIsVip());
|
||||
userEntity.setEndTime(userVip.getEndTime());
|
||||
userEntity.setVipType(userVip.getVipType());
|
||||
|
|
@ -137,12 +136,12 @@ public class UserController {
|
|||
@RequestMapping(value = "/selectUserList", method = RequestMethod.GET)
|
||||
@ApiOperation("查询所有用户列表")
|
||||
@ResponseBody
|
||||
public Result selectUserList(Integer page, Integer limit, String phone, Integer sex, String platform,
|
||||
String sysPhone, Integer status, Integer member, String inviterCode,
|
||||
public Result selectUserList(Integer page, Integer limit,String phone,Integer sex,String platform,
|
||||
String sysPhone,Integer status, Integer member, String inviterCode,
|
||||
String userName, String invitationCode, String startTime, String endTime,
|
||||
String qdCode, String sysUserName, Integer vipType) {
|
||||
String qdCode,String sysUserName,Integer vipType) {
|
||||
return Result.success().put("data", userService.selectUserPage(page, limit, phone, sex, platform, sysPhone, status, member,
|
||||
inviterCode, userName, invitationCode, startTime, endTime, qdCode, sysUserName, vipType));
|
||||
inviterCode, userName, invitationCode, startTime, endTime,qdCode,sysUserName,vipType));
|
||||
}
|
||||
|
||||
@GetMapping("/userListExcel")
|
||||
|
|
@ -164,28 +163,17 @@ public class UserController {
|
|||
@ApiOperation("修改用户")
|
||||
@ResponseBody
|
||||
public Result updateUserByUserId(@RequestBody UserEntity userEntity) {
|
||||
if (StringUtils.isNotEmpty(userEntity.getPhone())) {
|
||||
if(StringUtils.isNotEmpty(userEntity.getPhone())){
|
||||
UserEntity phoneUser = userService.queryByPhone(userEntity.getPhone());
|
||||
if (phoneUser != null && !phoneUser.getUserId().equals(userEntity.getUserId())) {
|
||||
if(phoneUser!=null && !phoneUser.getUserId().equals(userEntity.getUserId())){
|
||||
return Result.error("手机号已被其他用户绑定!");
|
||||
}
|
||||
}
|
||||
UserEntity userEntity2 = userService.queryByUserId(userEntity.getUserId());
|
||||
if (StringUtils.isNotEmpty(userEntity2.getQdCode())) {
|
||||
SysUserEntity sysUserEntity = sysUserService.getOne(new QueryWrapper<SysUserEntity>().eq("qd_code", userEntity2.getQdCode()));
|
||||
if (sysUserEntity == null) {
|
||||
if(StringUtils.isNotEmpty(userEntity.getQdCode())){
|
||||
SysUserEntity sysUserEntity = sysUserService.getOne(new QueryWrapper<SysUserEntity>().eq("qd_code", userEntity.getQdCode()));
|
||||
if(sysUserEntity==null){
|
||||
return Result.error("渠道码不正确!");
|
||||
}
|
||||
if (userEntity.getRate() != null) {
|
||||
if (sysUserEntity.getQdRate().compareTo(userEntity.getRate()) < 0) {
|
||||
return Result.error("下级佣金不可大于渠道商佣金");
|
||||
}
|
||||
}
|
||||
if (userEntity.getTwoRate() != null) {
|
||||
if (sysUserEntity.getQdRate().compareTo(userEntity.getTwoRate()) < 0) {
|
||||
return Result.error("下级佣金不可大于渠道商佣金");
|
||||
}
|
||||
}
|
||||
}
|
||||
userService.updateById(userEntity);
|
||||
return Result.success();
|
||||
|
|
@ -236,28 +224,28 @@ public class UserController {
|
|||
@GetMapping("/homeMessage")
|
||||
@ApiOperation("信息分析")
|
||||
public Result homeMessage(Long sysUserId) {
|
||||
String qdCode = null;
|
||||
if (sysUserId != null) {
|
||||
qdCode = sysUserService.getById(sysUserId).getQdCode();
|
||||
String qdCode=null;
|
||||
if(sysUserId!=null){
|
||||
qdCode=sysUserService.getById(sysUserId).getQdCode();
|
||||
}
|
||||
HomeMessageResponse homeMessageResponse = new HomeMessageResponse();
|
||||
// 0查总 1查天 2查月 3查年
|
||||
//设置总用户人数
|
||||
homeMessageResponse.setTotalUsers(userService.queryUserCount(0, null, null, qdCode));
|
||||
homeMessageResponse.setTotalUsers(userService.queryUserCount(0, null,null,qdCode));
|
||||
//设置今日新增
|
||||
homeMessageResponse.setNewToday(userService.queryUserCount(1, null, null, qdCode));
|
||||
homeMessageResponse.setNewToday(userService.queryUserCount(1, null,null,qdCode));
|
||||
//设置本月新增
|
||||
homeMessageResponse.setNewMonth(userService.queryUserCount(2, null, null, qdCode));
|
||||
homeMessageResponse.setNewMonth(userService.queryUserCount(2, null,null,qdCode));
|
||||
//设置本年新增
|
||||
homeMessageResponse.setNewYear(userService.queryUserCount(3, null, null, qdCode));
|
||||
homeMessageResponse.setNewYear(userService.queryUserCount(3, null,null,qdCode));
|
||||
//设置总收入
|
||||
homeMessageResponse.setTotalRevenue(userService.queryPayMoney(0, qdCode));
|
||||
homeMessageResponse.setTotalRevenue(userService.queryPayMoney(0,qdCode));
|
||||
//设置今日收入
|
||||
homeMessageResponse.setTodayRevenue(userService.queryPayMoney(1, qdCode));
|
||||
homeMessageResponse.setTodayRevenue(userService.queryPayMoney(1,qdCode));
|
||||
//设置本月收入
|
||||
homeMessageResponse.setMonthRevenue(userService.queryPayMoney(2, qdCode));
|
||||
homeMessageResponse.setMonthRevenue(userService.queryPayMoney(2,qdCode));
|
||||
//设置本年收入
|
||||
homeMessageResponse.setYearRevenue(userService.queryPayMoney(3, qdCode));
|
||||
homeMessageResponse.setYearRevenue(userService.queryPayMoney(3,qdCode));
|
||||
//查询指定日期下的短剧购买的 量
|
||||
return Result.success().put("data", homeMessageResponse);
|
||||
}
|
||||
|
|
@ -269,9 +257,10 @@ public class UserController {
|
|||
*/
|
||||
@GetMapping("/courseMessage")
|
||||
@ApiOperation("短剧分析")
|
||||
public Result courseMessage(Long page, Long limit, String date, int type, Long sysUserId) {
|
||||
PageUtils pageUtils = userService.queryCourseOrder(page, limit, type, TimeCompleteUtils.completeStartTime(date), sysUserId);
|
||||
return Result.success().put("data", pageUtils);
|
||||
public Result courseMessage(Long page, Long limit, String date, int type,Long sysUserId) {
|
||||
Page<Map<String, Object>> iPage = new Page<>(page, limit);
|
||||
IPage<Map<String, Object>> mapIPage = userService.queryCourseOrder(iPage, type, date,sysUserId);
|
||||
return Result.success().put("data", new PageUtils(mapIPage));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -279,58 +268,55 @@ public class UserController {
|
|||
*/
|
||||
@GetMapping("/userMessage")
|
||||
@ApiOperation("用户分析")
|
||||
public Result userMessage(String date, int type, Long sysUserId) {
|
||||
date = TimeCompleteUtils.completeStartTime(date);
|
||||
String qdCode = null;
|
||||
if (sysUserId != null) {
|
||||
qdCode = sysUserService.getById(sysUserId).getQdCode();
|
||||
public Result userMessage(String date, int type,Long sysUserId) {
|
||||
String qdCode=null;
|
||||
if(sysUserId!=null){
|
||||
qdCode=sysUserService.getById(sysUserId).getQdCode();
|
||||
}
|
||||
int sumUserCount = userService.queryUserCount(type, date, null, qdCode);
|
||||
int h5Count = userService.queryUserCount(type, date, "h5", qdCode);
|
||||
int appCount = userService.queryUserCount(type, date, "app", qdCode);
|
||||
int wxCount = userService.queryUserCount(type, date, "小程序", qdCode);
|
||||
int dyCount = userService.queryUserCount(type, date, "抖音", qdCode);
|
||||
int giveMemberCount = userService.userMessage(date, type, qdCode, 1);
|
||||
int moneyMemberCount = userService.userMessage(date, type, qdCode, 2);
|
||||
// int memberCount = userVipService.userMessage(date, type, qdCode, null);
|
||||
int memberCount = userService.userMessage(date, type, qdCode, null);
|
||||
int userCount = sumUserCount - memberCount;
|
||||
Map<String, Integer> result = new HashMap<>();
|
||||
result.put("sumUserCount", sumUserCount);
|
||||
result.put("h5Count", h5Count);
|
||||
result.put("appCount", appCount);
|
||||
result.put("wxCount", wxCount);
|
||||
result.put("dyCount", dyCount);
|
||||
result.put("memberCount", memberCount);
|
||||
result.put("giveMemberCount", giveMemberCount);
|
||||
result.put("moneyMemberCount", moneyMemberCount);
|
||||
result.put("userCount", userCount);
|
||||
int sumUserCount = userService.queryUserCount(type, date,null,qdCode);
|
||||
int h5Count = userService.queryUserCount(type, date,"h5",qdCode);
|
||||
int appCount = userService.queryUserCount(type, date,"app",qdCode);
|
||||
int wxCount = userService.queryUserCount(type, date,"小程序",qdCode);
|
||||
int dyCount = userService.queryUserCount(type, date,"抖音",qdCode);
|
||||
int giveMemberCount = userService.userMessage(date, type,qdCode,1);
|
||||
int moneyMemberCount = userService.userMessage(date, type,qdCode,2);
|
||||
int memberCount = userService.userMessage(date, type,qdCode,null);
|
||||
int userCount = sumUserCount-memberCount;
|
||||
Map<String,Integer> result=new HashMap<>();
|
||||
result.put("sumUserCount",sumUserCount);
|
||||
result.put("h5Count",h5Count);
|
||||
result.put("appCount",appCount);
|
||||
result.put("wxCount",wxCount);
|
||||
result.put("dyCount",dyCount);
|
||||
result.put("memberCount",memberCount);
|
||||
result.put("giveMemberCount",giveMemberCount);
|
||||
result.put("moneyMemberCount",moneyMemberCount);
|
||||
result.put("userCount",userCount);
|
||||
return Result.success().put("data", result);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("addCannotMoney/{userId}/{money}")
|
||||
@ApiOperation("添加金币")
|
||||
@ApiOperation("添加金豆")
|
||||
public Result addCannotMoney(@PathVariable("userId") Long userId, @PathVariable("money") Double money) {
|
||||
userMoneyService.updateMoney(1, userId, money);
|
||||
//inviteMoneyDao.updateInviteMoneySum(money,userId);
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||
userMoneyDetails.setUserId(userId);
|
||||
userMoneyDetails.setTitle("[增加金币]平台增加金币:" + money);
|
||||
userMoneyDetails.setContent("[增加金币]平台增加金币:" + money);
|
||||
userMoneyDetails.setTitle("[增加金豆]平台增加金豆:" + money);
|
||||
userMoneyDetails.setContent("[增加金豆]平台增加金豆:" + money);
|
||||
userMoneyDetails.setType(1);
|
||||
// ✅
|
||||
userMoneyDetails.setClassify(8);
|
||||
userMoneyDetails.setClassify(1);
|
||||
userMoneyDetails.setMoney(new BigDecimal(money));
|
||||
userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
||||
userMoneyDetails.setMoneyType(2);
|
||||
userMoneyDetailsService.save(userMoneyDetails);
|
||||
PayDetails payDetails = new PayDetails();
|
||||
PayDetails payDetails=new PayDetails();
|
||||
payDetails.setState(1);
|
||||
payDetails.setCreateTime(sdf.format(new Date()));
|
||||
payDetails.setUserId(userId);
|
||||
payDetails.setMoney(money);
|
||||
payDetails.setClassify(9);
|
||||
payDetails.setType(1);
|
||||
payDetails.setPayTime(sdf.format(new Date()));
|
||||
payDetailsDao.insert(payDetails);
|
||||
|
|
@ -338,72 +324,68 @@ public class UserController {
|
|||
}
|
||||
|
||||
@PostMapping("subCannotMoney/{userId}/{money}")
|
||||
@ApiOperation("减少金币")
|
||||
@ApiOperation("减少金豆")
|
||||
public Result subCannotMoney(@PathVariable("userId") Long userId, @PathVariable("money") Double money) {
|
||||
userMoneyService.updateMoney(2, userId, money);
|
||||
//inviteMoneyDao.updateInviteMoneySumSub(money,userId);
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||
userMoneyDetails.setUserId(userId);
|
||||
userMoneyDetails.setTitle("[减少金币]平台减少金币:" + money);
|
||||
userMoneyDetails.setContent("平台减少金币:" + money);
|
||||
userMoneyDetails.setTitle("[减少金豆]平台减少金豆:" + money);
|
||||
userMoneyDetails.setContent("平台减少金豆:" + money);
|
||||
userMoneyDetails.setType(1);
|
||||
// ✅
|
||||
userMoneyDetails.setClassify(8);
|
||||
userMoneyDetails.setClassify(1);
|
||||
userMoneyDetails.setMoney(new BigDecimal(money));
|
||||
userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
||||
userMoneyDetails.setMoneyType(2);
|
||||
userMoneyDetailsService.save(userMoneyDetails);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
@PostMapping("/updateSysUserMoney")
|
||||
@ApiOperation("修改金币")
|
||||
public Result updateSysUserMoney(Long userId, Double money, Integer type) {
|
||||
// userMoneyService.updateSysMoney(type, userId, money);
|
||||
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
// UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||
// userMoneyDetails.setSysUserId(userId);
|
||||
// if (type == 1) {
|
||||
// userMoneyDetails.setTitle("[增加金币]平台增加金币:" + money);
|
||||
// userMoneyDetails.setContent("[增加金币]平台增加金币:" + money);
|
||||
// } else {
|
||||
// userMoneyDetails.setTitle("[减少金币]平台减少金币:" + money);
|
||||
// userMoneyDetails.setContent("[减少金币]平台减少金币:" + money);
|
||||
// }
|
||||
// userMoneyDetails.setMoneyType(2);
|
||||
// userMoneyDetails.setType(type);
|
||||
// // ✅
|
||||
// userMoneyDetails.setClassify(8);
|
||||
// userMoneyDetails.setMoney(new BigDecimal(money));
|
||||
// userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
||||
// userMoneyDetailsService.save(userMoneyDetails);
|
||||
@ApiOperation("修改金豆")
|
||||
public Result updateSysUserMoney(Long userId, Double money,Integer type) {
|
||||
userMoneyService.updateSysMoney(type, userId, money);
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||
userMoneyDetails.setSysUserId(userId);
|
||||
if(type==1){
|
||||
userMoneyDetails.setTitle("[增加金豆]平台增加金豆:" + money);
|
||||
userMoneyDetails.setContent("[增加金豆]平台增加金豆:" + money);
|
||||
}else{
|
||||
userMoneyDetails.setTitle("[减少金豆]平台减少金豆:" + money);
|
||||
userMoneyDetails.setContent("[减少金豆]平台减少金豆:" + money);
|
||||
}
|
||||
userMoneyDetails.setType(type);
|
||||
userMoneyDetails.setClassify(1);
|
||||
userMoneyDetails.setMoney(new BigDecimal(money));
|
||||
userMoneyDetails.setCreateTime(sdf.format(new Date()));
|
||||
userMoneyDetailsService.save(userMoneyDetails);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
@GetMapping("/selectInviteUserList")
|
||||
@ApiOperation("邀请用户排行榜")
|
||||
public Result selectInviteUserList(Integer page, Integer limit, String phone, String userName) {
|
||||
public Result selectInviteUserList(Integer page,Integer limit,String phone,String userName){
|
||||
return userService.selectInviteUserList(page, limit, userName, phone);
|
||||
}
|
||||
|
||||
@GetMapping("/selectUserOnLineCount")
|
||||
@ApiOperation("统计当前在线人数")
|
||||
public Result selectUserCount(Long sysUserId) {
|
||||
String qdCode = null;
|
||||
if (sysUserId != null) {
|
||||
qdCode = sysUserService.getById(sysUserId).getQdCode();
|
||||
public Result selectUserCount(Long sysUserId){
|
||||
String qdCode=null;
|
||||
if(sysUserId!=null){
|
||||
qdCode=sysUserService.getById(sysUserId).getQdCode();
|
||||
}
|
||||
return userService.selectUserOnLineCount(qdCode);
|
||||
}
|
||||
|
||||
@GetMapping("/selectUserCountStatisticsByTime")
|
||||
@ApiOperation("用户统计")
|
||||
public Result selectUserCountStatisticsByTime(String startTime, String endTime) {
|
||||
List<Integer> userCountList = new ArrayList<>();
|
||||
List<String> year = new ArrayList<>();
|
||||
public Result selectUserCountStatisticsByTime(String startTime,String endTime){
|
||||
List<Integer> userCountList=new ArrayList<>();
|
||||
List<String> year=new ArrayList<>();
|
||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
Calendar calendar=Calendar.getInstance();
|
||||
Date parse = null;
|
||||
try {
|
||||
parse = simpleDateFormat.parse(startTime);
|
||||
|
|
@ -411,21 +393,22 @@ public class UserController {
|
|||
e.printStackTrace();
|
||||
}
|
||||
calendar.setTime(parse);
|
||||
while (true) {
|
||||
while (true){
|
||||
String dateTime = simpleDateFormat.format(calendar.getTime());
|
||||
int i = userService.queryUserCount(1, dateTime, null, null);
|
||||
int i = userService.queryUserCount(1, dateTime,null,null);
|
||||
userCountList.add(i);
|
||||
year.add(dateTime);
|
||||
if (dateTime.equals(endTime)) {
|
||||
if(dateTime.equals(endTime)){
|
||||
break;
|
||||
}
|
||||
calendar.add(Calendar.DATE, 1);
|
||||
calendar.add(Calendar.DATE,1);
|
||||
}
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
result.put("userCountList", userCountList);
|
||||
result.put("year", year);
|
||||
return Result.success().put("data", result);
|
||||
Map<String,Object> result=new HashMap<>();
|
||||
result.put("userCountList",userCountList);
|
||||
result.put("year",year);
|
||||
return Result.success().put("data",result);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -3,7 +3,6 @@ package com.sqx.modules.app.controller;
|
|||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.service.UserMoneyDetailsService;
|
||||
import com.sqx.modules.app.service.UserMoneyService;
|
||||
import com.sqx.modules.sys.service.SysUserMoneyService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
|
|
@ -14,17 +13,16 @@ import org.springframework.web.bind.annotation.RestController;
|
|||
@RestController
|
||||
@RequestMapping("/moneyDetails")
|
||||
@AllArgsConstructor
|
||||
@Api(value = "钱包明细", tags = {"钱包明细"})
|
||||
@Api("钱包明细")
|
||||
public class UserMoneyDetailsController {
|
||||
private UserMoneyDetailsService userMoneyDetailsService;
|
||||
private UserMoneyService userMoneyService;
|
||||
private SysUserMoneyService sysUserMoneyService;
|
||||
|
||||
|
||||
@ApiOperation("钱包明细")
|
||||
@GetMapping("/queryUserMoneyDetails")
|
||||
public Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId, Long userId,Integer classify,Integer type, Integer moneyType) {
|
||||
return userMoneyDetailsService.queryUserMoneyDetails(page, limit, sysUserId, userId,classify,type, moneyType, 0);
|
||||
public Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId, Long userId,Integer classify,Integer type) {
|
||||
return userMoneyDetailsService.queryUserMoneyDetails(page, limit, sysUserId, userId,classify,type);
|
||||
}
|
||||
|
||||
@GetMapping("/selectUserMoney")
|
||||
|
|
@ -36,7 +34,7 @@ public class UserMoneyDetailsController {
|
|||
@GetMapping("/selectSysUserMoney")
|
||||
@ApiOperation("代理钱包")
|
||||
public Result selectSysUserMoney(Long userId){
|
||||
return Result.success().put("data",sysUserMoneyService.selectSysUserMoneyByUserId(userId));
|
||||
return Result.success().put("data",userMoneyService.selectSysUserMoneyByUserId(userId));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
package com.sqx.modules.app.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sqx.common.utils.DateUtils;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.common.utils.Result;
|
||||
|
|
@ -18,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
|
|||
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@Api(value = "会员管理", tags = {"会员管理"})
|
||||
|
|
@ -92,10 +89,7 @@ public class VipDetailsController {
|
|||
@ApiParam("查询会员列表")
|
||||
@GetMapping("/selectVipDetailsList")
|
||||
public Result selectVipDetailsList(Integer page,Integer limit) {
|
||||
PageHelper.startPage(page,limit);
|
||||
List<VipDetails> list = vipDetailsService.list();
|
||||
PageInfo<VipDetails> pageInfo = new PageInfo<>(list);
|
||||
return Result.success().put("data", PageUtils.page(pageInfo));
|
||||
return Result.success().put("data",new PageUtils(vipDetailsService.page(new Page<>(page,limit))));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
package com.sqx.modules.app.controller.app;
|
||||
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.annotation.Login;
|
||||
import com.sqx.modules.app.service.AdService;
|
||||
import com.sqx.modules.callback.service.UniAdCallbackRecordService;
|
||||
import com.sqx.modules.sys.controller.AbstractController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/app/ad")
|
||||
public class AdController extends AbstractController {
|
||||
|
||||
private final UniAdCallbackRecordService callbackRecordService;
|
||||
private final AdService adService;
|
||||
|
||||
public AdController(UniAdCallbackRecordService callbackRecordService, AdService adService) {
|
||||
this.callbackRecordService = callbackRecordService;
|
||||
this.adService = adService;
|
||||
}
|
||||
|
||||
@Login
|
||||
@GetMapping("/state")
|
||||
public Result getAdState(@RequestParam String extraKey, @RequestAttribute Long userId) {
|
||||
return Result.success(callbackRecordService.getStateByExtraKey(userId, extraKey));
|
||||
}
|
||||
|
||||
@Login
|
||||
@GetMapping("/detail")
|
||||
public Result getAdDetail(@RequestAttribute Long userId) {
|
||||
return Result.success(adService.getDetail(userId));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
package com.sqx.modules.app.controller.app;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.announcement.entity.Announcement;
|
||||
import com.sqx.modules.announcement.service.AnnouncementService;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/app/announcement")
|
||||
public class AppAnnouncementController {
|
||||
|
||||
private final AnnouncementService announcementService;
|
||||
|
||||
public AppAnnouncementController(AnnouncementService announcementService) {
|
||||
this.announcementService = announcementService;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
public Result get() {
|
||||
PageHelper.startPage(1,1);
|
||||
List<Announcement> list = announcementService.list(new LambdaQueryWrapper<Announcement>()
|
||||
.eq(Announcement::getState, 1)
|
||||
.orderByDesc(Announcement::getCreateTime));
|
||||
return Result.success().put("data", list.isEmpty() ? null : list.get(0));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,74 +1,45 @@
|
|||
package com.sqx.modules.app.controller.app;
|
||||
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.IdcardUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.sqx.common.annotation.Debounce;
|
||||
import com.sqx.common.utils.ApiAccessLimitUtil;
|
||||
import com.sqx.common.utils.DataLimitUtil;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.annotation.Login;
|
||||
import com.sqx.modules.app.annotation.LoginUser;
|
||||
import com.sqx.modules.app.entity.TbUserBlacklist;
|
||||
import com.sqx.modules.app.entity.UserEntity;
|
||||
import com.sqx.modules.app.entity.UserInfo;
|
||||
import com.sqx.modules.app.mapper.TbUserBlacklistMapper;
|
||||
import com.sqx.modules.app.service.AliService;
|
||||
import com.sqx.modules.app.service.AppService;
|
||||
import com.sqx.modules.app.service.UserInfoService;
|
||||
import com.sqx.modules.app.service.UserService;
|
||||
import com.sqx.modules.common.service.CommonInfoService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.codec.digest.DigestUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* APP登录授权
|
||||
* @author mac
|
||||
*
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/app/user")
|
||||
@Api(value = "APP管理", tags = {"APP管理"})
|
||||
@Slf4j
|
||||
public class AppController {
|
||||
|
||||
@Autowired
|
||||
private UserService userService;
|
||||
@Autowired
|
||||
private AppService appService;
|
||||
@Autowired
|
||||
private CommonInfoService commonRepository;
|
||||
private final UserInfoService userInfoService;
|
||||
private final AliService aliService;
|
||||
@Autowired
|
||||
private TbUserBlacklistMapper tbUserBlacklistMapper;
|
||||
|
||||
public AppController(UserInfoService userInfoService, AliService aliService) {
|
||||
this.userInfoService = userInfoService;
|
||||
this.aliService = aliService;
|
||||
}
|
||||
|
||||
@PostMapping("/authenticationRegister")
|
||||
@ApiOperation("认证创建账号")
|
||||
public Result authenticationRegister(@RequestBody JSONObject jsonObject, HttpServletRequest request) {
|
||||
return userService.authenticationRegister(jsonObject, request);
|
||||
public Result authenticationRegister(@RequestBody JSONObject jsonObject, HttpServletRequest request){
|
||||
return userService.authenticationRegister(jsonObject,request);
|
||||
}
|
||||
|
||||
@Login
|
||||
@PostMapping("/getNewUserRed")
|
||||
@ApiOperation("领取新用户红包")
|
||||
public Result getNewUserRed(@RequestAttribute Long userId) {
|
||||
public Result getNewUserRed(@RequestAttribute Long userId){
|
||||
return userService.getNewUserRed(userId);
|
||||
}
|
||||
|
||||
|
|
@ -76,15 +47,15 @@ public class AppController {
|
|||
@RequestMapping(value = "/updatePwd", method = RequestMethod.POST)
|
||||
@ResponseBody
|
||||
@ApiOperation("用户端修改密码")
|
||||
public Result updatePwd(@LoginUser UserEntity user, String pwd, String oldPwd) {
|
||||
if (!user.getPassword().equals(DigestUtils.sha256Hex(oldPwd))) {
|
||||
public Result updatePwd(@LoginUser UserEntity user,String pwd,String oldPwd) {
|
||||
if(!user.getPassword().equals(DigestUtils.sha256Hex(oldPwd))){
|
||||
return Result.error("原始密码不正确!");
|
||||
}
|
||||
if (pwd.equals(oldPwd)) {
|
||||
if(pwd.equals(oldPwd)){
|
||||
return Result.error("新密码不能与旧密码相同!");
|
||||
}
|
||||
user.setPassword(DigestUtils.sha256Hex(pwd));
|
||||
userService.update(user, new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getUserId, user.getUserId()));
|
||||
userService.updateById(user);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
|
|
@ -92,123 +63,58 @@ public class AppController {
|
|||
@RequestMapping(value = "/updatePhone", method = RequestMethod.POST)
|
||||
@ApiOperation("用户端换绑手机号")
|
||||
@ResponseBody
|
||||
public Result updatePhone(@RequestAttribute("userId") Long userId, @RequestParam String phone, @RequestParam String msg) {
|
||||
return userService.updatePhone(phone, msg, userId);
|
||||
public Result updatePhone(@RequestAttribute("userId") Long userId,@RequestParam String phone, @RequestParam String msg) {
|
||||
return userService.updatePhone(phone, msg,userId);
|
||||
}
|
||||
|
||||
@Login
|
||||
@RequestMapping(value = "/updateUser", method = RequestMethod.POST)
|
||||
@ApiOperation("用户修改个人信息")
|
||||
@ResponseBody
|
||||
@Debounce(interval = 3000, value = "#userId")
|
||||
public Result updateUserImageUrl(@RequestAttribute("userId") Long userId, @RequestParam(required = false) String zhiFuBao,
|
||||
@RequestParam String certName, @RequestParam(required = false) String certNum) {
|
||||
if (StrUtil.isAllBlank(zhiFuBao, certNum)) {
|
||||
return Result.error("支付宝账号或实名身份证号码必须传递一个");
|
||||
}
|
||||
|
||||
UserInfo userInfo = userInfoService.getByUserId(userId);
|
||||
UserEntity userEntity = userService.getById(userId);
|
||||
|
||||
if (StrUtil.isNotBlank(zhiFuBao) && (!zhiFuBao.equals(userEntity.getZhiFuBao())) || !certName.equals(userEntity.getZhiFuBaoName())) {
|
||||
int count = userService.count(new QueryWrapper<UserEntity>()
|
||||
.ne("user_id", userId)
|
||||
.eq("zhi_fu_bao_name", certName)
|
||||
.eq("zhi_fu_bao", zhiFuBao));
|
||||
if (count > 0) {
|
||||
return Result.error("支付宝信息修改失败: 此支付宝账号已被绑定");
|
||||
}
|
||||
if (StrUtil.isNotBlank(userInfo.getCertName()) && !certName.equals(userInfo.getCertName())) {
|
||||
return Result.error("支付宝信息修改失败: 姓名与实名认证信息不相符");
|
||||
}
|
||||
|
||||
if (!DataLimitUtil.isAccessAllowed(zhiFuBao + certName, Integer.parseInt(commonRepository.findOne(924).getValue()), "month")) {
|
||||
return Result.error("支付宝信息修改失败: 相同支付宝账号每月可绑定次数已用完");
|
||||
}
|
||||
|
||||
if (!ApiAccessLimitUtil.isAccessAllowed(userId.toString(), "updateZFB", Integer.parseInt(commonRepository.findOne(925).getValue()), "month")) {
|
||||
return Result.error("支付宝信息修改失败: 每月可修改次数已用完,请联系管理员");
|
||||
}
|
||||
|
||||
userEntity.setZhiFuBao(zhiFuBao);
|
||||
userEntity.setZhiFuBaoName(certName);
|
||||
userService.update(userEntity, new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getUserId, userId));
|
||||
}
|
||||
|
||||
if (StrUtil.isBlank(certNum)) {
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
|
||||
if (!certNum.equals(userInfo.getCertNo()) || !certName.equals(userInfo.getCertName())) {
|
||||
if (StrUtil.isNotBlank(userEntity.getZhiFuBaoName()) && !certName.equals(userEntity.getZhiFuBaoName())) {
|
||||
return Result.error("实名修改失败: 姓名与绑定支付宝信息不相符");
|
||||
}
|
||||
if (!IdcardUtil.isValidCard(certNum)) {
|
||||
return Result.error("实名修改失败: 身份证号码有误");
|
||||
}
|
||||
|
||||
Integer idCount = userInfoService.countCertCount(certName, certNum);
|
||||
if (idCount >= 1) {
|
||||
return Result.error("实名修改失败: 此身份证信息已绑定过");
|
||||
}
|
||||
|
||||
if (!ApiAccessLimitUtil.getCertAuthIsAccessAllowed(String.valueOf(userId), "updateAuthCertInfo", 1)) {
|
||||
return Result.error("实名修改失败: 每月可修改次数已用完,请联系管理员");
|
||||
}
|
||||
|
||||
if (!ApiAccessLimitUtil.getCertAuthIsAccessAllowed(certNum, "updateAuthCertInfoByIdCard", 1)) {
|
||||
return Result.error("实名修改失败: 每月可修改次数已用完,请联系管理员");
|
||||
}
|
||||
|
||||
try {
|
||||
// 校验实名信息是否在黑名单里面
|
||||
Integer count = tbUserBlacklistMapper.selectCount(new LambdaQueryWrapper<TbUserBlacklist>().eq(TbUserBlacklist::getRealName, certName)
|
||||
.eq(TbUserBlacklist::getIdCardNo, certNum));
|
||||
if (count > 0) {
|
||||
userEntity.setStatus(0);
|
||||
userService.update(userEntity, new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getUserId, userId));
|
||||
log.warn("异常行为用户:实名信息异常: {}", userId);
|
||||
return Result.error("异常行为: 您的实名信息存在异常行为");
|
||||
}
|
||||
|
||||
aliService.authCertNo(certName, certNum);
|
||||
userInfo.setCertName(certName);
|
||||
userInfo.setCertNo(certNum);
|
||||
userInfo.setUpdateTime(DateUtil.date());
|
||||
boolean update = userInfoService.update(userInfo, new LambdaQueryWrapper<UserInfo>().eq(UserInfo::getUserId, userId).eq(UserInfo::getId, userInfo.getId()));
|
||||
if (!update) {
|
||||
return Result.error("实名修改失败: 请稍后重试");
|
||||
}
|
||||
ApiAccessLimitUtil.setCertAuthIsAccessAllowed(String.valueOf(userId), "updateAuthCertInfo", 1, "month");
|
||||
ApiAccessLimitUtil.setCertAuthIsAccessAllowed(certNum, "updateAuthCertInfoByIdCard", 1, "month");
|
||||
return Result.success();
|
||||
} catch (Exception e) {
|
||||
return Result.error("实名修改失败: 身份证信息不匹配");
|
||||
}
|
||||
}
|
||||
|
||||
public Result updateUserImageUrl(@RequestAttribute("userId") Long userId,String zhiFuBao,String zhiFuBaoName) {
|
||||
UserEntity userEntity=new UserEntity();
|
||||
userEntity.setZhiFuBao(zhiFuBao);
|
||||
userEntity.setZhiFuBaoName(zhiFuBaoName);
|
||||
userEntity.setUserId(userId);
|
||||
userService.updateById(userEntity);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Login
|
||||
@RequestMapping(value = "/updateUsers", method = RequestMethod.POST)
|
||||
@ApiOperation("用户修改个人信息")
|
||||
@ResponseBody
|
||||
public Result updateUsers(@RequestAttribute("userId") Long userId, @RequestBody UserEntity userEntity) {
|
||||
public Result updateUsers(@RequestAttribute("userId") Long userId,@RequestBody UserEntity userEntity) {
|
||||
userEntity.setUserId(userId);
|
||||
userService.update(userEntity, new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getUserId, userId));
|
||||
userService.updateById(userEntity);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
|
||||
/*@Login
|
||||
@RequestMapping(value = "/updateUsers", method = RequestMethod.POST)
|
||||
@ApiOperation("用户修改个人信息")
|
||||
@ResponseBody
|
||||
public Result updateUsers(@RequestAttribute("userId") Long userId,String userName,String avatar,String phone) {
|
||||
UserEntity userEntity=new UserEntity();
|
||||
userEntity.setUserId(userId);
|
||||
userEntity.setUserName(userName);
|
||||
userEntity.setAvatar(avatar);
|
||||
userEntity.setPhone(phone);
|
||||
userService.updateById(userEntity);
|
||||
return Result.success();
|
||||
}*/
|
||||
|
||||
|
||||
@Login
|
||||
@RequestMapping(value = "/updateUserImageUrl", method = RequestMethod.POST)
|
||||
@ApiOperation("用户修改头像")
|
||||
@ResponseBody
|
||||
public Result updateUserImageUrl(@LoginUser UserEntity user, String avatar) {
|
||||
public Result updateUserImageUrl(@LoginUser UserEntity user,String avatar) {
|
||||
user.setAvatar(avatar);
|
||||
userService.update(user, new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getUserId, user.getUserId()));
|
||||
userService.updateById(user);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
|
|
@ -216,9 +122,9 @@ public class AppController {
|
|||
@RequestMapping(value = "/updateUserName", method = RequestMethod.POST)
|
||||
@ApiOperation("用户修改昵称")
|
||||
@ResponseBody
|
||||
public Result updateUserName(@LoginUser UserEntity user, String userName) {
|
||||
public Result updateUserName(@LoginUser UserEntity user,String userName) {
|
||||
user.setUserName(userName);
|
||||
userService.update(user, new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getUserId, user.getUserId()));
|
||||
userService.updateById(user);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
|
|
@ -227,13 +133,7 @@ public class AppController {
|
|||
@ApiOperation("获取用户详细信息")
|
||||
@ResponseBody
|
||||
public Result selectUserById(@LoginUser UserEntity user) {
|
||||
UserInfo userInfo = userInfoService.getByUserId(user.getUserId());
|
||||
Map<String, Object> map = BeanUtil.beanToMap(user);
|
||||
map.putAll(BeanUtil.beanToMap(userInfo));
|
||||
if (StrUtil.isBlank(user.getZhiFuBaoName()) && StrUtil.isNotBlank(userInfo.getCertName())) {
|
||||
map.put("zhiFuBaoName", userInfo.getCertName());
|
||||
}
|
||||
return Result.success().put("data", map);
|
||||
return Result.success().put("data",user);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -241,25 +141,25 @@ public class AppController {
|
|||
@ApiOperation("升级检测")
|
||||
@ResponseBody
|
||||
public Result selectNewApp() {
|
||||
return Result.success().put("data", appService.selectNewApp());
|
||||
return Result.success().put("data",appService.selectNewApp());
|
||||
}
|
||||
|
||||
@GetMapping("/openId/{code:.+}/{userId}")
|
||||
@ApiOperation("根据code获取openid")
|
||||
public Result getOpenid(@PathVariable("code") String code, @PathVariable("userId") Long userId) {
|
||||
return userService.getOpenId(code, userId);
|
||||
public Result getOpenid(@PathVariable("code") String code,@PathVariable("userId")Long userId) {
|
||||
return userService.getOpenId(code,userId);
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/updateClientId", method = RequestMethod.GET)
|
||||
@ApiOperation("绑定ClientId")
|
||||
@ResponseBody
|
||||
public Result updateClientId(String clientId, Long userId, Integer sysPhone) {
|
||||
public Result updateClientId(String clientId,Long userId,Integer sysPhone ) {
|
||||
userService.updateUserClientIdIsNull(clientId);
|
||||
UserEntity userEntity = new UserEntity();
|
||||
UserEntity userEntity=new UserEntity();
|
||||
userEntity.setSysPhone(sysPhone);
|
||||
userEntity.setUserId(userId);
|
||||
userEntity.setClientid(clientId);
|
||||
userService.update(userEntity, new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getUserId, userId));
|
||||
userService.updateById(userEntity);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,7 @@ package com.sqx.modules.app.controller.app;
|
|||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.sqx.common.annotation.Debounce;
|
||||
import com.sqx.common.utils.ApiAccessLimitUtil;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.annotation.Login;
|
||||
import com.sqx.modules.app.dao.AuthCertNoDTO;
|
||||
import com.sqx.modules.app.entity.UserEntity;
|
||||
import com.sqx.modules.app.service.IAppleService;
|
||||
import com.sqx.modules.app.service.UserService;
|
||||
|
|
@ -22,7 +18,6 @@ import io.swagger.annotations.ApiOperation;
|
|||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import weixin.popular.api.SnsAPI;
|
||||
import weixin.popular.bean.sns.SnsToken;
|
||||
|
|
@ -148,7 +143,6 @@ public class AppLoginController {
|
|||
@RequestMapping(value = "/registerCode", method = RequestMethod.POST)
|
||||
@ApiOperation("app或h5注册或登录")
|
||||
@ResponseBody
|
||||
@Debounce(interval = 2500, value = "#phone")
|
||||
public Result registerCode(@RequestParam String phone,String msg,String platform,Integer sysPhone,
|
||||
String password,String inviterCode,String wxId,String qdCode) {
|
||||
return userService.registerCode(phone,msg,platform,sysPhone,password,inviterCode,wxId,qdCode);
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|||
@RestController
|
||||
@RequestMapping("/app/moneyDetails")
|
||||
@AllArgsConstructor
|
||||
@Api(value = "钱包明细app版本", tags = {"钱包明细app版本"})
|
||||
@Api("钱包明细")
|
||||
public class AppUserMoneyDetailsController {
|
||||
|
||||
private UserMoneyDetailsService userMoneyDetailsService;
|
||||
|
|
@ -25,9 +25,8 @@ public class AppUserMoneyDetailsController {
|
|||
@Login
|
||||
@ApiOperation("钱包明细")
|
||||
@GetMapping("/queryUserMoneyDetails")
|
||||
public Result queryUserMoneyDetails(Integer page, Integer limit, @RequestAttribute Long userId,Integer classify,
|
||||
Integer type, Integer moneyType, Integer viewType) {
|
||||
return userMoneyDetailsService.queryUserMoneyDetails(page, limit,null, userId,classify,type, moneyType ,viewType);
|
||||
public Result queryUserMoneyDetails(Integer page, Integer limit, @RequestAttribute Long userId,Integer classify,Integer type) {
|
||||
return userMoneyDetailsService.queryUserMoneyDetails(page, limit,null, userId,1,type);
|
||||
}
|
||||
|
||||
@Login
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
package com.sqx.modules.app.controller.app;
|
||||
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.annotation.Login;
|
||||
import com.sqx.modules.userSign.dto.UserSignDTO;
|
||||
import com.sqx.modules.userSign.service.UserSignRecordService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* @author tankaikai
|
||||
* @since 2024-12-19 15:23
|
||||
*/
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@Api(value = "用户签到", tags = {"用户签到"})
|
||||
@RequestMapping(value = "/app/userSignRecord")
|
||||
public class AppUserSignController {
|
||||
|
||||
@Autowired
|
||||
private UserSignRecordService userSignRecordService;
|
||||
|
||||
/**
|
||||
* 获取用户连续签到数据
|
||||
*/
|
||||
@Login
|
||||
@GetMapping("/getUserSignData")
|
||||
@ApiOperation("获取用户连续签到数据")
|
||||
public Result getUserSignData(@RequestAttribute("userId") Long userId) {
|
||||
UserSignDTO data = userSignRecordService.getUserSignData(userId);
|
||||
return Result.success().put("data", data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取连续签到奖励配置
|
||||
*/
|
||||
@Login
|
||||
@GetMapping("/getUserSignAwardConfig")
|
||||
@ApiOperation(value = "获取连续签到奖励配置", notes = "如:[7,7] = 连续签到7天奖励7元")
|
||||
public Result getUserSignAwardConfig() {
|
||||
String[] data = userSignRecordService.getUserSignAwardConfig();
|
||||
return Result.success().put("data", data);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
package com.sqx.modules.app.dao;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
@Data
|
||||
public class AuthCertNoDTO {
|
||||
@NotBlank
|
||||
private String name;
|
||||
@NotBlank
|
||||
private String idNum;
|
||||
}
|
||||
|
|
@ -1,13 +1,14 @@
|
|||
package com.sqx.modules.app.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.sqx.modules.app.entity.UserEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 用户
|
||||
|
|
@ -16,7 +17,7 @@ import java.util.Set;
|
|||
public interface UserDao extends BaseMapper<UserEntity> {
|
||||
|
||||
|
||||
List<UserEntity> selectUserPage(@Param("search") String search, @Param("sex") Integer sex, @Param("platform") String platform,
|
||||
IPage<UserEntity> selectUserPage(@Param("page") Page<UserEntity> page, @Param("search") String search, @Param("sex") Integer sex, @Param("platform") String platform,
|
||||
@Param("sysPhone") String sysPhone, @Param("status") Integer status, @Param("member") Integer member,
|
||||
@Param("inviterCode") String inviterCode, @Param("userName") String userName,
|
||||
@Param("invitationCode") String invitationCode, @Param("startTime") String startTime,
|
||||
|
|
@ -30,13 +31,13 @@ public interface UserDao extends BaseMapper<UserEntity> {
|
|||
|
||||
Double queryPayMoney(@Param("type") int type, @Param("date") String date,String qdCode);
|
||||
|
||||
List<Map<String, Object>> queryCourseOrder(@Param("type") int type, @Param("start") String start, @Param("end") String end,Long sysUserId);
|
||||
IPage<Map<String, Object>> queryCourseOrder(Page iPage,@Param("type") int type, @Param("date") String date,Long sysUserId);
|
||||
|
||||
int userMessage( String date, int type,String qdCode,Integer vipType);
|
||||
|
||||
int insertUser(UserEntity userEntity);
|
||||
|
||||
List<UserEntity> selectInviteUserList(@Param("queryUserIdList") Set<Long> queryUserIdList);
|
||||
IPage<UserEntity> selectInviteUserList(Page<UserEntity> page,String userName,String phone);
|
||||
|
||||
int selectUserOnLineCount(String qdCode);
|
||||
|
||||
|
|
|
|||
|
|
@ -3,27 +3,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
|||
import com.sqx.modules.app.entity.UserMoney;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
import org.apache.ibatis.annotations.Update;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Mapper
|
||||
public interface UserMoneyDao extends BaseMapper<UserMoney> {
|
||||
|
||||
void updateMayMoney(@Param("type") Integer type, @Param("userId")Long userId, @Param("money") Double money);
|
||||
|
||||
void updateMayAmount(@Param("type") Integer type, @Param("userId")Long userId, @Param("amount") Double amount);
|
||||
void updateMayAmount(@Param("type") Integer type, @Param("userId")Long userId, @Param("money") Double amount);
|
||||
|
||||
@Select("select sum(money) from user_money_details where user_id=#{userId} and classify in (6,1) and (content like '%额外奖励金币%' or content like '获取金币')")
|
||||
BigDecimal sumMoney(Long userId);
|
||||
void updateSysMoney(@Param("type") Integer type, @Param("sysUserId")Long sysUserId, @Param("money") Double money);
|
||||
|
||||
@Select("select sum(money) from user_money_details where user_id=#{userId} and classify=6 and content like '%额外奖励现金红包%'")
|
||||
BigDecimal sumMoney2(Long userId);
|
||||
|
||||
@Update("update user_money set amount=amount+#{money} where user_id=#{userId}")
|
||||
Boolean incrMoney(@Param("money") String money, @Param("userId") Long userId);
|
||||
|
||||
@Update("update user_money set amount=amount-#{money} where user_id=#{userId}")
|
||||
Boolean decrMoney(@Param("money") String money, @Param("userId") Long userId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,21 +4,10 @@ import com.sqx.modules.app.entity.UserMoneyDetails;
|
|||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@Mapper
|
||||
public interface UserMoneyDetailsDao extends BaseMapper<UserMoneyDetails> {
|
||||
|
||||
|
||||
Double monthIncome(@Param("date") String date,@Param("userId") Long userId);
|
||||
|
||||
/**
|
||||
* 查询用户邀请收益
|
||||
*/
|
||||
Double queryUserInviteMoney(@Param("userId") Long userId);
|
||||
|
||||
/**
|
||||
* 查询用户邀请金币
|
||||
*/
|
||||
Double queryUserInviteGoldMoney(@Param("userId") Long userId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
package com.sqx.modules.app.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.sqx.modules.app.entity.UserPrizeExchange;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 用户奖品兑换
|
||||
*
|
||||
* @author tankaikai
|
||||
* @since 2024-12-20 18:11
|
||||
*/
|
||||
@Mapper
|
||||
public interface UserPrizeExchangeDao extends BaseMapper<UserPrizeExchange> {
|
||||
}
|
||||
|
|
@ -2,8 +2,6 @@ package com.sqx.modules.app.entity;
|
|||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
|
@ -15,7 +13,6 @@ import java.io.Serializable;
|
|||
@TableName("app")
|
||||
public class App implements Serializable {
|
||||
@TableId
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long id;
|
||||
|
||||
private String createAt;
|
||||
|
|
|
|||
|
|
@ -1,64 +0,0 @@
|
|||
package com.sqx.modules.app.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
*
|
||||
* @TableName invite_achievement
|
||||
*/
|
||||
@TableName(value ="invite_achievement")
|
||||
@Data
|
||||
@EqualsAndHashCode
|
||||
@ToString
|
||||
public class InviteAchievement implements Serializable {
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@TableId(type = IdType.ID_WORKER)
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 邀请用户用户id -- 上级
|
||||
*/
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 下级被邀请用户id 当前达标用户id
|
||||
*/
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long targetUserId;
|
||||
|
||||
/**
|
||||
* 达标次数
|
||||
*/
|
||||
private Integer count;
|
||||
|
||||
/**
|
||||
* 是否首次达标
|
||||
*/
|
||||
private Integer state;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private Date createTime;
|
||||
private Date updateTime;
|
||||
|
||||
@TableField(exist = false)
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -2,8 +2,6 @@ package com.sqx.modules.app.entity;
|
|||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
|
@ -19,7 +17,6 @@ public class Msg implements Serializable {
|
|||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long id;
|
||||
|
||||
private String code;
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
package com.sqx.modules.app.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 用户黑名单
|
||||
* @author tankaikai
|
||||
* @since 2025-01-07 12:56
|
||||
*/
|
||||
@Data
|
||||
@TableName(value ="tb_user_blacklist")
|
||||
public class TbUserBlacklist implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type=IdType.AUTO)
|
||||
private Long id;
|
||||
|
||||
private String idCardNo;
|
||||
|
||||
private String realName;
|
||||
|
||||
}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
package com.sqx.modules.app.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 提现黑名单表
|
||||
* @author tankaikai
|
||||
* @since 2025-01-07 12:56
|
||||
*/
|
||||
@Data
|
||||
@TableName(value ="tb_withdraw_blacklist")
|
||||
public class TbWithdrawBlacklist implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type=IdType.AUTO)
|
||||
private Long id;
|
||||
private String realName;
|
||||
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ public class UserDetails {
|
|||
*/
|
||||
private int monthlyOrderNum;
|
||||
/**
|
||||
* 本月充值金币
|
||||
* 本月充值金豆
|
||||
*/
|
||||
private BigDecimal monthlyRechargeMoney;
|
||||
/**
|
||||
|
|
@ -19,7 +19,7 @@ public class UserDetails {
|
|||
*/
|
||||
private int monthWithdrawalNum;
|
||||
/**
|
||||
* 本月提现金币
|
||||
* 本月提现金豆
|
||||
*/
|
||||
private BigDecimal monthlyWithdrawalMoney;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
|
|||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
|
@ -30,8 +28,7 @@ public class UserEntity implements Serializable {
|
|||
*/
|
||||
@Excel(name = "用户id", orderNum = "1")
|
||||
@ApiModelProperty("用户id")
|
||||
@TableId(type = IdType.ID_WORKER)
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
@TableId(type = IdType.AUTO, value = "user_id")
|
||||
private Long userId;
|
||||
/**
|
||||
* 用户名
|
||||
|
|
@ -159,7 +156,6 @@ public class UserEntity implements Serializable {
|
|||
private String zhiFuBao;
|
||||
|
||||
@Excel(name = "支付宝名称", orderNum = "8", width = 18)
|
||||
@TableField("zhi_fu_bao_name")
|
||||
private String zhiFuBaoName;
|
||||
|
||||
@Excel(name = "一级推广收益比例", orderNum = "8", width = 18)
|
||||
|
|
@ -202,4 +198,5 @@ public class UserEntity implements Serializable {
|
|||
@TableField(exist = false)
|
||||
private Integer vipType;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,96 +0,0 @@
|
|||
package com.sqx.modules.app.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
*
|
||||
* @TableName user_info
|
||||
*/
|
||||
@TableName(value ="user_info")
|
||||
@Data
|
||||
public class UserInfo implements Serializable {
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@TableId(type = IdType.ID_WORKER)
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 用户id
|
||||
*/
|
||||
@TableField(updateStrategy = FieldStrategy.NEVER)
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 姓名
|
||||
*/
|
||||
private String certName;
|
||||
|
||||
/**
|
||||
* 身份证号码
|
||||
*/
|
||||
private String certNo;
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
private Date updateTime;
|
||||
|
||||
@TableField(exist = false)
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Override
|
||||
public boolean equals(Object that) {
|
||||
if (this == that) {
|
||||
return true;
|
||||
}
|
||||
if (that == null) {
|
||||
return false;
|
||||
}
|
||||
if (getClass() != that.getClass()) {
|
||||
return false;
|
||||
}
|
||||
UserInfo other = (UserInfo) that;
|
||||
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
|
||||
&& (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
|
||||
&& (this.getCertName() == null ? other.getCertName() == null : this.getCertName().equals(other.getCertName()))
|
||||
&& (this.getCertNo() == null ? other.getCertNo() == null : this.getCertNo().equals(other.getCertNo()))
|
||||
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
|
||||
result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
|
||||
result = prime * result + ((getCertName() == null) ? 0 : getCertName().hashCode());
|
||||
result = prime * result + ((getCertNo() == null) ? 0 : getCertNo().hashCode());
|
||||
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append(getClass().getSimpleName());
|
||||
sb.append(" [");
|
||||
sb.append("Hash = ").append(hashCode());
|
||||
sb.append(", id=").append(id);
|
||||
sb.append(", userId=").append(userId);
|
||||
sb.append(", certName=").append(certName);
|
||||
sb.append(", certNo=").append(certNo);
|
||||
sb.append(", updateTime=").append(updateTime);
|
||||
sb.append(", serialVersionUID=").append(serialVersionUID);
|
||||
sb.append("]");
|
||||
return sb.toString();
|
||||
}
|
||||
}
|
||||
|
|
@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
|
|||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
|
|
@ -25,18 +23,17 @@ public class UserMoney implements Serializable {
|
|||
* 主键id
|
||||
*/
|
||||
@ApiModelProperty("主键id")
|
||||
@TableId(type = IdType.ID_WORKER)
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
@TableId(type = IdType.AUTO)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 钱包金币
|
||||
* 钱包金豆
|
||||
*/
|
||||
@ApiModelProperty("钱包金币")
|
||||
@ApiModelProperty("钱包金豆")
|
||||
private BigDecimal money;
|
||||
|
||||
/**
|
||||
* 钱包金币
|
||||
* 钱包金豆
|
||||
*/
|
||||
@ApiModelProperty("钱包余额 钱")
|
||||
private BigDecimal amount;
|
||||
|
|
@ -46,7 +43,6 @@ public class UserMoney implements Serializable {
|
|||
*/
|
||||
@ApiModelProperty("用户id")
|
||||
@TableField("user_id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
|
|
@ -54,10 +50,6 @@ public class UserMoney implements Serializable {
|
|||
*/
|
||||
@ApiModelProperty("渠道用户id")
|
||||
@TableField("sys_user_id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long sysUserId;
|
||||
|
||||
private BigDecimal inviteIncomeMoney;;
|
||||
private BigDecimal inviteIncomeCoin;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,21 @@
|
|||
package com.sqx.modules.app.entity;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@TableName("user_money_details")
|
||||
@ApiModel("钱包详情")
|
||||
public class UserMoneyDetails implements Serializable {
|
||||
|
|
@ -24,15 +23,13 @@ public class UserMoneyDetails implements Serializable {
|
|||
* 钱包详情id
|
||||
*/
|
||||
@ApiModelProperty("钱包详情id")
|
||||
@TableId(type = IdType.ID_WORKER)
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
@TableId(type = IdType.AUTO)
|
||||
private Long id;
|
||||
/**
|
||||
* 用户id
|
||||
*/
|
||||
@TableField("user_id")
|
||||
@ApiModelProperty("用户id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
|
|
@ -40,47 +37,23 @@ public class UserMoneyDetails implements Serializable {
|
|||
*/
|
||||
@ApiModelProperty("渠道用户id")
|
||||
@TableField("sys_user_id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long sysUserId;
|
||||
@ApiModelProperty("源id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long sourceId;
|
||||
|
||||
/**
|
||||
* 对应用户id
|
||||
*/
|
||||
@TableField("by_user_id")
|
||||
@ApiModelProperty("对应用户id")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long byUserId;
|
||||
/**
|
||||
* 标题
|
||||
*/
|
||||
@ApiModelProperty("标题")
|
||||
private String title;
|
||||
|
||||
/***
|
||||
* 1 注册 (上级)
|
||||
* 2 充值
|
||||
* 3 购买
|
||||
* 4 提现
|
||||
* 5 现金大转盘
|
||||
* 6 分享达标
|
||||
* 7 任务领取
|
||||
* 8 平台操作
|
||||
* 9 订单退款
|
||||
* 10 渠道推广
|
||||
/**
|
||||
* 1注册 2首次购买 3购买 4提现
|
||||
*/
|
||||
@ApiModelProperty(" * 1 注册 (上级)\n" +
|
||||
" * 2 充值\n" +
|
||||
" * 3 购买\n" +
|
||||
" * 4 提现\n" +
|
||||
" * 5 现金大转盘\n" +
|
||||
" * 6 分享达标\n" +
|
||||
" * 7 任务领取\n" +
|
||||
" * 8 平台操作\n" +
|
||||
" * 9 订单退款\n" +
|
||||
" * 10 渠道推广")
|
||||
@ApiModelProperty("1充值钱包明细 2提现钱包明细")
|
||||
private Integer classify;
|
||||
/**
|
||||
* 类别(1充值2支出)
|
||||
|
|
@ -93,19 +66,15 @@ public class UserMoneyDetails implements Serializable {
|
|||
@ApiModelProperty("状态 1待支付 2已到账 3取消")
|
||||
private Integer state;
|
||||
/**
|
||||
* 金币
|
||||
* 金豆
|
||||
*/
|
||||
@ApiModelProperty("金币")
|
||||
@ApiModelProperty("金豆")
|
||||
private BigDecimal money;
|
||||
/**
|
||||
* 内容
|
||||
*/
|
||||
@ApiModelProperty("内容")
|
||||
private String content;
|
||||
|
||||
@ApiModelProperty("金额类型: 1 红包,2金币")
|
||||
private Integer moneyType;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
|
|
@ -113,48 +82,5 @@ public class UserMoneyDetails implements Serializable {
|
|||
@ApiModelProperty("创建时间")
|
||||
private String createTime;
|
||||
|
||||
public UserMoneyDetails() {
|
||||
}
|
||||
|
||||
/**
|
||||
* @param userId 用户Id tb_user的id
|
||||
* @param sysUserId 系统用户Id tb_sys_user的id
|
||||
* @param byUserId 对应用户Id
|
||||
* @param title 标题
|
||||
* @param classify 1 注册 (上级)2 充值 3 购买 4 提现 5 现金大转盘 6 分享达标 7 任务领取 8 平台操作 9 订单退款 10 渠道推广
|
||||
* @param type 类别(1充值2支出)
|
||||
* @param state 状态 1待支付 2已到账 3取消
|
||||
* @param money 金额
|
||||
* @param content 内容描述
|
||||
*/
|
||||
public UserMoneyDetails(Long userId, Long sysUserId, Long byUserId, String title, Integer classify, Integer type,
|
||||
Integer state, BigDecimal money, String content, Integer moneyType,Long sourceId) {
|
||||
this.userId = userId;
|
||||
this.sysUserId = sysUserId;
|
||||
this.byUserId = byUserId;
|
||||
this.title = title;
|
||||
this.classify = classify;
|
||||
this.type = type;
|
||||
this.state = state;
|
||||
this.money = money;
|
||||
this.content = content;
|
||||
this.createTime = DateUtil.now();
|
||||
this.moneyType = moneyType;
|
||||
this.sourceId = sourceId;
|
||||
}
|
||||
|
||||
public UserMoneyDetails(Long userId, Long sysUserId, Long byUserId, String title, Integer classify, Integer type,
|
||||
Integer state, BigDecimal money, String content, Integer moneyType) {
|
||||
this.userId = userId;
|
||||
this.sysUserId = sysUserId;
|
||||
this.byUserId = byUserId;
|
||||
this.title = title;
|
||||
this.classify = classify;
|
||||
this.type = type;
|
||||
this.state = state;
|
||||
this.money = money;
|
||||
this.content = content;
|
||||
this.createTime = DateUtil.now();
|
||||
this.moneyType = moneyType;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,81 +0,0 @@
|
|||
package com.sqx.modules.app.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 用户奖品兑换
|
||||
*
|
||||
* @author tankaikai
|
||||
* @since 2024-12-20 17:52
|
||||
*/
|
||||
@Data
|
||||
@TableName("user_prize_exchange")
|
||||
public class UserPrizeExchange implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 奖品记录
|
||||
*/
|
||||
@TableId(type = IdType.ID_WORKER)
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long id;
|
||||
/**
|
||||
* 奖品引用id
|
||||
*/
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long foreignId;
|
||||
/**
|
||||
* 活动类型 task-任务奖励 spinning-大转盘
|
||||
*/
|
||||
private String foreignType;
|
||||
/**
|
||||
* 奖品名称
|
||||
*/
|
||||
private String prizeName;
|
||||
/**
|
||||
* 奖品图片地址
|
||||
*/
|
||||
private String imgUrl;
|
||||
/**
|
||||
* 用户id
|
||||
*/
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long userId;
|
||||
/**
|
||||
* 用户名
|
||||
*/
|
||||
private String userName;
|
||||
/**
|
||||
* 手机号
|
||||
*/
|
||||
private String phone;
|
||||
/**
|
||||
* 收货地址
|
||||
*/
|
||||
private String address;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 状态 0-待发放 1-已发放
|
||||
*/
|
||||
private Integer status;
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private Date createTime;
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
private Date updateTime;
|
||||
}
|
||||
|
|
@ -2,8 +2,6 @@ package com.sqx.modules.app.entity;
|
|||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
|
@ -15,7 +13,6 @@ public class UserVip implements Serializable {
|
|||
* 用户会员ID
|
||||
*/
|
||||
@TableId
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long vipId;
|
||||
/**
|
||||
* 会员类型
|
||||
|
|
@ -24,7 +21,6 @@ public class UserVip implements Serializable {
|
|||
/**
|
||||
* 用户ID
|
||||
*/
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
|
|||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
|
|
@ -22,8 +20,7 @@ import java.math.BigDecimal;
|
|||
@ApiModel("会员详情")
|
||||
public class VipDetails implements Serializable {
|
||||
|
||||
@TableId
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
@TableId(type = IdType.AUTO)
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty("会员类型")
|
||||
|
|
|
|||
|
|
@ -1,28 +1,14 @@
|
|||
package com.sqx.modules.app.interceptor;
|
||||
|
||||
|
||||
import cn.hutool.core.thread.ThreadUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.sqx.common.exception.CzgException;
|
||||
import com.sqx.common.exception.SqxException;
|
||||
import com.sqx.common.utils.DateUtils;
|
||||
import com.sqx.common.utils.IPUtils;
|
||||
import com.sqx.modules.app.annotation.Login;
|
||||
import com.sqx.modules.app.entity.TbUserBlacklist;
|
||||
import com.sqx.modules.app.entity.UserEntity;
|
||||
import com.sqx.modules.app.entity.UserInfo;
|
||||
import com.sqx.modules.app.mapper.TbUserBlacklistMapper;
|
||||
import com.sqx.modules.app.service.UserInfoService;
|
||||
import com.sqx.modules.app.service.UserService;
|
||||
import com.sqx.modules.app.utils.JwtUtils;
|
||||
import com.sqx.modules.redisService.RedisService;
|
||||
import io.jsonwebtoken.Claims;
|
||||
import com.sqx.modules.app.annotation.Login;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
|
@ -35,102 +21,54 @@ import java.util.Date;
|
|||
|
||||
/**
|
||||
* 权限(Token)验证
|
||||
*
|
||||
*/
|
||||
@Component
|
||||
public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
|
||||
private static final Logger log = LoggerFactory.getLogger(AuthorizationInterceptor.class);
|
||||
@Autowired
|
||||
private JwtUtils jwtUtils;
|
||||
@Autowired
|
||||
private UserService userService;
|
||||
@Autowired
|
||||
private UserInfoService userInfoService;
|
||||
@Autowired
|
||||
private TbUserBlacklistMapper tbUserBlacklistMapper;
|
||||
|
||||
private final RedisService redisService;
|
||||
|
||||
public static final String USER_KEY = "userId";
|
||||
|
||||
public AuthorizationInterceptor(RedisService redisService) {
|
||||
this.redisService = redisService;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
|
||||
Login annotation;
|
||||
if (handler instanceof HandlerMethod) {
|
||||
if(handler instanceof HandlerMethod) {
|
||||
annotation = ((HandlerMethod) handler).getMethodAnnotation(Login.class);
|
||||
} else {
|
||||
}else{
|
||||
return true;
|
||||
}
|
||||
|
||||
if (annotation == null) {
|
||||
if(annotation == null){
|
||||
return true;
|
||||
}
|
||||
|
||||
// 获取用户凭证
|
||||
//获取用户凭证
|
||||
String token = request.getHeader(jwtUtils.getHeader());
|
||||
if (StringUtils.isBlank(token)) {
|
||||
if(StringUtils.isBlank(token)){
|
||||
token = request.getParameter(jwtUtils.getHeader());
|
||||
}
|
||||
|
||||
// 凭证为空
|
||||
if (StringUtils.isBlank(token)) {
|
||||
//凭证为空
|
||||
if(StringUtils.isBlank(token)){
|
||||
throw new SqxException(jwtUtils.getHeader() + "不能为空", HttpStatus.UNAUTHORIZED.value());
|
||||
}
|
||||
|
||||
Claims claims = jwtUtils.getClaimByToken(token);
|
||||
if (claims == null || jwtUtils.isTokenExpired(claims.getExpiration())) {
|
||||
if(claims == null || jwtUtils.isTokenExpired(claims.getExpiration())){
|
||||
throw new SqxException(jwtUtils.getHeader() + "失效,请重新登录", HttpStatus.UNAUTHORIZED.value());
|
||||
}
|
||||
|
||||
//设置userId到request里,后续根据userId,获取用户信息
|
||||
long userId = Long.parseLong(claims.getSubject());
|
||||
request.setAttribute(USER_KEY, userId);
|
||||
|
||||
String ip = IPUtils.getIpAddr(request); // 获取用户的 IP 地址
|
||||
// 检查用户是否超过限流
|
||||
if (redisService.checkIpJumpLimit(userId, ip)) {
|
||||
log.warn("用户地址跳动频繁,封禁: {}", userId);
|
||||
if (!redisService.isSetUserState(userId)) {
|
||||
ThreadUtil.execAsync(() -> {
|
||||
userService.update(null, new LambdaUpdateWrapper<UserEntity>()
|
||||
.eq(UserEntity::getUserId, userId)
|
||||
.set(UserEntity::getStatus, 0));
|
||||
});
|
||||
}
|
||||
throw new CzgException("ip跳动过于频繁,请联系管理员解封");
|
||||
}
|
||||
|
||||
// ThreadUtil.execAsync(() -> {
|
||||
// redisService.recordUrlVisitCountWithIp(userId, request.getRequestURI(), ip);
|
||||
// });
|
||||
|
||||
// 设置 userId 到 request 里,后续根据 userId 获取用户信息
|
||||
UserEntity user = userService.selectUserById(userId);
|
||||
if (user != null && user.getStatus().equals(0)) {
|
||||
throw new CzgException("异常行为用户: {}" + user.getUserId());
|
||||
}
|
||||
// 实名认证信息
|
||||
UserInfo userInfo = userInfoService.getOne(new LambdaQueryWrapper<UserInfo>().eq(UserInfo::getUserId, user.getUserId()));
|
||||
if (userInfo != null && StrUtil.isNotBlank(userInfo.getCertNo())) {
|
||||
TbUserBlacklist blacklist = tbUserBlacklistMapper.selectOne(Wrappers.<TbUserBlacklist>lambdaQuery().eq(TbUserBlacklist::getIdCardNo, userInfo.getCertNo()));
|
||||
if (blacklist != null) {
|
||||
// 提出用户
|
||||
throw new SqxException(jwtUtils.getHeader() + "失效,请重新登录", HttpStatus.UNAUTHORIZED.value());
|
||||
}
|
||||
}
|
||||
|
||||
if (redisService.isRecordUserOnLineTime(userId)) {
|
||||
ThreadUtil.execAsync(() -> {
|
||||
// 记录用户最后一次调用接口的时间
|
||||
UserEntity userEntity = new UserEntity();
|
||||
userEntity.setUserId(userId);
|
||||
userEntity.setOnLineTime(DateUtils.format(new Date()));
|
||||
userService.updateById(userEntity);
|
||||
});
|
||||
}
|
||||
|
||||
//记录用户最后一次调用接口的时间
|
||||
UserEntity userEntity=new UserEntity();
|
||||
userEntity.setUserId(userId);
|
||||
userEntity.setOnLineTime(DateUtils.format(new Date()));
|
||||
userService.updateById(userEntity);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
package com.sqx.modules.app.mapper;
|
||||
|
||||
import com.sqx.modules.app.entity.InviteAchievement;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Insert;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Update;
|
||||
|
||||
/**
|
||||
* @author Administrator
|
||||
* @description 针对表【invite_achievement】的数据库操作Mapper
|
||||
* @createDate 2024-12-30 13:26:18
|
||||
* @Entity com.sqx.modules.app.entity.InviteAchievement
|
||||
*/
|
||||
@Mapper
|
||||
public interface InviteAchievementMapper extends BaseMapper<InviteAchievement> {
|
||||
|
||||
@Update("update invite_achievement set count = count + #{i}, update_time=now() where id = #{id} and user_id = #{userId}")
|
||||
int incrCount(Long id, Long userId, int i);
|
||||
|
||||
@Insert("INSERT INTO invite_achievement (user_id, source_user_id, count, state, create_time)\n" +
|
||||
"SELECT #{userId}, #{sourceUserId}, #{count}, #{state}, #{createTime} " +
|
||||
"WHERE NOT EXISTS ( " +
|
||||
" SELECT 1 FROM invite_achievement WHERE user_id = #{userId} " +
|
||||
");")
|
||||
boolean insertNotExists(InviteAchievement inviteAchievement);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
package com.sqx.modules.app.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.sqx.modules.app.entity.TbUserBlacklist;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 实名认证黑名单 Mapper
|
||||
* @author tankaikai
|
||||
* @since 2025-01-07 12:56
|
||||
*/
|
||||
@Mapper
|
||||
public interface TbUserBlacklistMapper extends BaseMapper<TbUserBlacklist> {
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
package com.sqx.modules.app.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.sqx.modules.app.entity.TbWithdrawBlacklist;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 提现黑名单 Mapper
|
||||
* @author tankaikai
|
||||
* @since 2025-01-07 12:56
|
||||
*/
|
||||
@Mapper
|
||||
public interface TbWithdrawBlacklistMapper extends BaseMapper<TbWithdrawBlacklist> {
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
package com.sqx.modules.app.mapper;
|
||||
|
||||
import com.sqx.modules.app.entity.UserInfo;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @author Administrator
|
||||
* @description 针对表【user_info】的数据库操作Mapper
|
||||
* @createDate 2025-01-02 14:15:08
|
||||
* @Entity com.sqx.modules.app.entity.UserInfo
|
||||
*/
|
||||
@Mapper
|
||||
public interface UserInfoMapper extends BaseMapper<UserInfo> {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ public class CourseOrderResponse implements Serializable {
|
|||
*/
|
||||
private int coursenum;
|
||||
/**
|
||||
* 售卖金币
|
||||
* 售卖金豆
|
||||
*/
|
||||
private Double coursemoney;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
package com.sqx.modules.app.service;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
public interface AdService {
|
||||
HashMap<String, Object> getDetail(Long userId);
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
package com.sqx.modules.app.service;
|
||||
|
||||
|
||||
public interface AliService {
|
||||
void authCertNo(String name, String idCard);
|
||||
}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
package com.sqx.modules.app.service;
|
||||
|
||||
import com.sqx.modules.app.entity.InviteAchievement;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* @author Administrator
|
||||
* @description 针对表【invite_achievement】的数据库操作Service
|
||||
* @createDate 2024-12-30 13:26:18
|
||||
*/
|
||||
public interface InviteAchievementService extends IService<InviteAchievement> {
|
||||
|
||||
int countByUserId(Long userId);
|
||||
|
||||
InviteAchievement getByUserId(Long userId);
|
||||
|
||||
int incrCount(Long id, Long userId, int i);
|
||||
|
||||
boolean insertNotExists(InviteAchievement inviteAchievement);
|
||||
|
||||
int countBySourceUserId(Long userId);
|
||||
|
||||
int countNum(Long userId, Integer signCount);
|
||||
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
package com.sqx.modules.app.service;
|
||||
|
||||
import com.sqx.modules.app.entity.UserInfo;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* @author Administrator
|
||||
* @description 针对表【user_info】的数据库操作Service
|
||||
* @createDate 2025-01-02 14:15:08
|
||||
*/
|
||||
public interface UserInfoService extends IService<UserInfo> {
|
||||
|
||||
UserInfo getByUserId(long userId);
|
||||
|
||||
Integer countCertCount(String name, String idNum);
|
||||
|
||||
}
|
||||
|
|
@ -4,13 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
|||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.entity.UserMoneyDetails;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public interface UserMoneyDetailsService extends IService<UserMoneyDetails> {
|
||||
Result queryUserMoneyDetails(Integer page, Integer limit, Long sysUserId, Long userId, Integer classify,
|
||||
Integer type, Integer moneyType, Integer viewType);
|
||||
|
||||
Double monthIncome(String date, Long userId);
|
||||
|
||||
Map<String, Double> queryUserTotalEarning(Long userId);
|
||||
Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId,Long userId,Integer classify,Integer type);
|
||||
Double monthIncome(String date,Long userId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,12 @@ public interface UserMoneyService extends IService<UserMoney> {
|
|||
|
||||
UserMoney selectUserMoneyByUserId(Long userId);
|
||||
|
||||
UserMoney selectSysUserMoneyByUserId(Long userId);
|
||||
|
||||
void updateMoney(int i, Long userId, double money);
|
||||
|
||||
void updateAmount(int i, Long userId, double amount);
|
||||
|
||||
void updateSysMoney(int i, Long userId, double money);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
package com.sqx.modules.app.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.modules.app.entity.UserPrizeExchange;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 用户奖品兑换Service
|
||||
*
|
||||
* @author tankaikai
|
||||
* @since 2024-12-20 18:04
|
||||
*/
|
||||
public interface UserPrizeExchangeService extends IService<UserPrizeExchange> {
|
||||
/**
|
||||
* 分页查询
|
||||
*
|
||||
* @param params
|
||||
* @return
|
||||
*/
|
||||
PageUtils page(Map<String, Object> params);
|
||||
|
||||
/**
|
||||
* 兑换奖品
|
||||
*
|
||||
* @param entity
|
||||
*/
|
||||
void exchange(Long currentUserId, UserPrizeExchange entity);
|
||||
|
||||
/**
|
||||
* 发放奖品
|
||||
*
|
||||
* @param dto
|
||||
*/
|
||||
|
||||
void deliver(UserPrizeExchange dto);
|
||||
|
||||
/**
|
||||
* 领取满签奖励现金红包
|
||||
* @param currentUserId
|
||||
*/
|
||||
void receive(Long currentUserId);
|
||||
}
|
||||
|
|
@ -2,14 +2,16 @@ package com.sqx.modules.app.service;
|
|||
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.dao.AuthCertNoDTO;
|
||||
import com.sqx.modules.app.entity.UserEntity;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 用户
|
||||
|
|
@ -212,7 +214,7 @@ public interface UserService extends IService<UserEntity> {
|
|||
|
||||
Double queryPayMoney(int type,String qdCode);
|
||||
|
||||
PageUtils queryCourseOrder(Long page, Long limit, int type, String date,Long sysUserId);
|
||||
IPage<Map<String, Object>> queryCourseOrder(Page<Map<String, Object>> iPage, int type, String date,Long sysUserId);
|
||||
|
||||
int userMessage( String date, int type,String qdCode,Integer vipType);
|
||||
|
||||
|
|
@ -225,15 +227,4 @@ public interface UserService extends IService<UserEntity> {
|
|||
|
||||
int updateUserClientIdIsNull(String clientid);
|
||||
|
||||
void firstBindAwardsMoney(UserEntity entity);
|
||||
|
||||
/**
|
||||
* 二要素身份证认证
|
||||
*/
|
||||
Object authCertNo(long userId, AuthCertNoDTO authCertNoDTO);
|
||||
|
||||
/**
|
||||
* 封禁拉黑用户
|
||||
*/
|
||||
void addBlackUser(Long userId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
package com.sqx.modules.app.service.impl;
|
||||
|
||||
import com.sqx.common.utils.RedisUtils;
|
||||
import com.sqx.modules.app.service.AdService;
|
||||
import com.sqx.modules.redisService.impl.RedisServiceImpl;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
@Service
|
||||
public class AdServiceImpl implements AdService {
|
||||
|
||||
private final RedisServiceImpl redisServiceImpl;
|
||||
|
||||
public AdServiceImpl(RedisServiceImpl redisServiceImpl) {
|
||||
this.redisServiceImpl = redisServiceImpl;
|
||||
}
|
||||
|
||||
@Override
|
||||
public HashMap<String, Object> getDetail(Long userId) {
|
||||
Long freeWatchRemainTime = redisServiceImpl.getFreeWatchRemainTime(userId, false);
|
||||
Long permanentlyFreeWatchRemainTime = redisServiceImpl.getFreeWatchRemainTime(userId, true);
|
||||
return new HashMap<String, Object>(){{
|
||||
put("adFreeWatchTime", permanentlyFreeWatchRemainTime);
|
||||
put("payFreeWatchTime", freeWatchRemainTime);
|
||||
put("totalFreeWatchTime", freeWatchRemainTime + permanentlyFreeWatchRemainTime);
|
||||
}};
|
||||
}
|
||||
}
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
package com.sqx.modules.app.service.impl;
|
||||
|
||||
import com.aliyun.dytnsapi20200217.Client;
|
||||
import com.aliyun.dytnsapi20200217.models.CertNoTwoElementVerificationRequest;
|
||||
import com.aliyun.dytnsapi20200217.models.CertNoTwoElementVerificationResponse;
|
||||
import com.aliyun.teautil.models.RuntimeOptions;
|
||||
import com.sqx.common.exception.SqxException;
|
||||
import com.sqx.modules.app.service.AliService;
|
||||
import com.sqx.modules.common.entity.CommonInfo;
|
||||
import com.sqx.modules.common.service.CommonInfoService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.PostConstruct;
|
||||
|
||||
@Service
|
||||
@Slf4j
|
||||
public class AliServiceImpl implements AliService {
|
||||
private final CommonInfoService commonInfoService;
|
||||
private Client client;
|
||||
|
||||
public AliServiceImpl(CommonInfoService commonInfoService) {
|
||||
this.commonInfoService = commonInfoService;
|
||||
}
|
||||
|
||||
@PostConstruct
|
||||
public void init() throws Exception {
|
||||
CommonInfo keyIdInfo = commonInfoService.findOne(85);
|
||||
CommonInfo securityInfo = commonInfoService.findOne(86);
|
||||
|
||||
com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config()
|
||||
// 必填,请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_ID。
|
||||
.setAccessKeyId(keyIdInfo.getValue())
|
||||
// 必填,请确保代码运行环境设置了环境变量 ALIBABA_CLOUD_ACCESS_KEY_SECRET。
|
||||
.setAccessKeySecret(securityInfo.getValue());
|
||||
config.endpoint = "dytnsapi.aliyuncs.com";
|
||||
this.client = new Client(config);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void authCertNo(String name, String idCard) {
|
||||
log.info("阿里云二要素认证请求参数: {} {}", name, idCard);
|
||||
CertNoTwoElementVerificationRequest certNoTwoElementVerificationRequest = new com.aliyun.dytnsapi20200217.models.CertNoTwoElementVerificationRequest()
|
||||
.setAuthCode("t92K8i9ae6")
|
||||
.setCertName(name)
|
||||
.setCertNo(idCard);
|
||||
RuntimeOptions runtime = new com.aliyun.teautil.models.RuntimeOptions();
|
||||
try {
|
||||
CertNoTwoElementVerificationResponse resp = client.certNoTwoElementVerificationWithOptions(certNoTwoElementVerificationRequest, runtime);
|
||||
log.info("阿里云二要素认证响应参数: {}", resp);
|
||||
if (resp.getStatusCode() != 200) {
|
||||
throw new SqxException("请求失败");
|
||||
}
|
||||
|
||||
if (!"OK".equals(resp.getBody().getCode())) {
|
||||
throw new SqxException(resp.getBody().getMessage());
|
||||
}
|
||||
|
||||
if (!"1".equals(resp.getBody().getData().getIsConsistent())) {
|
||||
throw new SqxException("身份证信息不匹配,认证失败");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
throw new SqxException(e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
package com.sqx.modules.app.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.sqx.modules.app.entity.InviteAchievement;
|
||||
import com.sqx.modules.app.service.InviteAchievementService;
|
||||
import com.sqx.modules.app.mapper.InviteAchievementMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* @author Administrator
|
||||
* @description 针对表【invite_achievement】的数据库操作Service实现
|
||||
* @createDate 2024-12-30 13:26:18
|
||||
*/
|
||||
@Service
|
||||
public class InviteAchievementServiceImpl extends ServiceImpl<InviteAchievementMapper, InviteAchievement>
|
||||
implements InviteAchievementService{
|
||||
|
||||
@Override
|
||||
public int countByUserId(Long userId) {
|
||||
return count(new LambdaQueryWrapper<InviteAchievement>()
|
||||
.eq(InviteAchievement::getUserId, userId));
|
||||
}
|
||||
|
||||
@Override
|
||||
public InviteAchievement getByUserId(Long userId) {
|
||||
return getOne(new LambdaQueryWrapper<InviteAchievement>()
|
||||
.eq(InviteAchievement::getTargetUserId, userId));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int incrCount(Long id, Long userId, int i) {
|
||||
return baseMapper.incrCount(id, userId,i);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertNotExists(InviteAchievement inviteAchievement) {
|
||||
return baseMapper.insertNotExists(inviteAchievement);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int countBySourceUserId(Long userId) {
|
||||
return count(new LambdaQueryWrapper<InviteAchievement>()
|
||||
.eq(InviteAchievement::getState, 1)
|
||||
.eq(InviteAchievement::getUserId, userId));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int countNum(Long userId, Integer signCount) {
|
||||
return count(new LambdaQueryWrapper<InviteAchievement>()
|
||||
.eq(InviteAchievement::getUserId, userId)
|
||||
.ge(InviteAchievement::getCount, signCount));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
package com.sqx.modules.app.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.sqx.modules.app.entity.UserInfo;
|
||||
import com.sqx.modules.app.mapper.UserInfoMapper;
|
||||
import com.sqx.modules.app.service.UserInfoService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* @author Administrator
|
||||
* @description 针对表【user_info】的数据库操作Service实现
|
||||
* @createDate 2025-01-02 14:15:08
|
||||
*/
|
||||
@Service
|
||||
public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo>
|
||||
implements UserInfoService{
|
||||
|
||||
@Override
|
||||
public UserInfo getByUserId(long userId) {
|
||||
UserInfo userInfo = getOne(new LambdaQueryWrapper<UserInfo>()
|
||||
.eq(UserInfo::getUserId, userId));
|
||||
if (userInfo == null) {
|
||||
userInfo = new UserInfo();
|
||||
userInfo.setUserId(userId);
|
||||
save(userInfo);
|
||||
}
|
||||
return userInfo;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer countCertCount(String name, String idNum) {
|
||||
return count(new LambdaQueryWrapper<UserInfo>()
|
||||
.eq(UserInfo::getCertName, name)
|
||||
.eq(UserInfo::getCertNo, idNum));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,79 +1,40 @@
|
|||
package com.sqx.modules.app.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.dao.UserMoneyDetailsDao;
|
||||
import com.sqx.modules.app.entity.UserMoney;
|
||||
import com.sqx.modules.app.entity.UserMoneyDetails;
|
||||
import com.sqx.modules.app.service.UserMoneyDetailsService;
|
||||
import com.sqx.modules.sys.entity.SysUserMoneyDetails;
|
||||
import com.sqx.modules.sys.service.SysUserMoneyDetailsService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao, UserMoneyDetails> implements UserMoneyDetailsService {
|
||||
|
||||
@Autowired
|
||||
private SysUserMoneyDetailsService sysUserMoneyDetailsService;
|
||||
|
||||
@Override
|
||||
public Result queryUserMoneyDetails(Integer page, Integer limit, Long sysUserId, Long userId, Integer classify,
|
||||
Integer type, Integer moneyType, Integer viewType) {
|
||||
PageHelper.startPage(page, limit);
|
||||
if (sysUserId != null) {
|
||||
List<SysUserMoneyDetails> list = sysUserMoneyDetailsService.list(new LambdaQueryWrapper<SysUserMoneyDetails>()
|
||||
.eq(SysUserMoneyDetails::getUserId, sysUserId).orderByDesc(SysUserMoneyDetails::getCreateTime));
|
||||
return Result.success().put("data", PageUtils.page(new PageInfo<>(list), true));
|
||||
}
|
||||
public Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId,Long userId,Integer classify,Integer type) {
|
||||
IPage<UserMoneyDetails> page1 = new Page(page, limit);
|
||||
QueryWrapper<UserMoneyDetails> queryWrapper = new QueryWrapper();
|
||||
if (userId != null) {
|
||||
if(sysUserId!=null){
|
||||
queryWrapper.eq("sys_user_id", sysUserId);
|
||||
}
|
||||
if(userId!=null){
|
||||
queryWrapper.eq("user_id", userId);
|
||||
}
|
||||
if (classify != null) {
|
||||
if(classify!=null){
|
||||
queryWrapper.eq("classify", classify);
|
||||
}
|
||||
if (type != null) {
|
||||
if(type!=null){
|
||||
queryWrapper.eq("type", type);
|
||||
}
|
||||
if (moneyType != null) {
|
||||
queryWrapper.eq("money_type", moneyType);
|
||||
}
|
||||
if (viewType == 1) {
|
||||
ArrayList<Integer> arrayList = new ArrayList<>();
|
||||
arrayList.add(1);
|
||||
arrayList.add(6);
|
||||
queryWrapper.in("classify", arrayList);
|
||||
}
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
return Result.success().put("data", PageUtils.page(new PageInfo<>(baseMapper.selectList(queryWrapper)), true));
|
||||
return Result.success().put("data", baseMapper.selectPage(page1, queryWrapper));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Double monthIncome(String date, Long userId) {
|
||||
return baseMapper.monthIncome(date, userId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Double> queryUserTotalEarning(Long userId) {
|
||||
Double inviteMoney = baseMapper.queryUserInviteMoney(userId);
|
||||
Double inviteGoldMoney = baseMapper.queryUserInviteGoldMoney(userId);
|
||||
|
||||
|
||||
Map<String, Double> map = new HashMap<>(2);
|
||||
map.put("inviteMoney", inviteMoney == null ? 0 : inviteMoney);
|
||||
map.put("inviteGoldMoney", inviteGoldMoney == null ? 0 : inviteGoldMoney);
|
||||
|
||||
return map;
|
||||
return baseMapper.monthIncome(date,userId);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,12 @@ public class UserMoneyServiceImpl extends ServiceImpl<UserMoneyDao, UserMoney> i
|
|||
baseMapper.updateMayAmount(i,userId,amount);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateSysMoney(int i, Long userId, double money){
|
||||
selectSysUserMoneyByUserId(userId);
|
||||
baseMapper.updateSysMoney(i,userId,money);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserMoney selectUserMoneyByUserId(Long userId){
|
||||
UserMoney userMoney = baseMapper.selectOne(new QueryWrapper<UserMoney>().eq("user_id", userId));
|
||||
|
|
@ -36,4 +42,19 @@ public class UserMoneyServiceImpl extends ServiceImpl<UserMoneyDao, UserMoney> i
|
|||
}
|
||||
return userMoney;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserMoney selectSysUserMoneyByUserId(Long userId){
|
||||
UserMoney userMoney = baseMapper.selectOne(new QueryWrapper<UserMoney>().eq("sys_user_id", userId));
|
||||
if(userMoney==null){
|
||||
userMoney=new UserMoney();
|
||||
userMoney.setSysUserId(userId);
|
||||
userMoney.setMoney(new BigDecimal("0.00"));
|
||||
userMoney.setAmount(new BigDecimal("0.00"));
|
||||
baseMapper.insert(userMoney);
|
||||
}
|
||||
return userMoney;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,280 +0,0 @@
|
|||
package com.sqx.modules.app.service.impl;
|
||||
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.lang.Dict;
|
||||
import cn.hutool.core.lang.Validator;
|
||||
import cn.hutool.core.map.MapProxy;
|
||||
import cn.hutool.core.util.ArrayUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.aliyun.tea.ValidateException;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sqx.common.exception.SqxException;
|
||||
import com.sqx.common.utils.Constant;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.modules.app.dao.UserDao;
|
||||
import com.sqx.modules.app.dao.UserPrizeExchangeDao;
|
||||
import com.sqx.modules.app.entity.UserEntity;
|
||||
import com.sqx.modules.app.entity.UserMoneyDetails;
|
||||
import com.sqx.modules.app.entity.UserPrizeExchange;
|
||||
import com.sqx.modules.app.service.UserMoneyDetailsService;
|
||||
import com.sqx.modules.app.service.UserMoneyService;
|
||||
import com.sqx.modules.app.service.UserPrizeExchangeService;
|
||||
import com.sqx.modules.common.entity.CommonInfo;
|
||||
import com.sqx.modules.common.service.CommonInfoService;
|
||||
import com.sqx.modules.discSpinning.dao.DiscSpinningRecordDao;
|
||||
import com.sqx.modules.discSpinning.entity.DiscSpinningRecord;
|
||||
import com.sqx.modules.discSpinning.service.DiscSpinningRecordService;
|
||||
import com.sqx.modules.taskCenter.dao.TaskCenterRecordDao;
|
||||
import com.sqx.modules.taskCenter.dao.TaskCenterRewardDao;
|
||||
import com.sqx.modules.taskCenter.entity.TaskCenterRecord;
|
||||
import com.sqx.modules.taskCenter.entity.TaskCenterReward;
|
||||
import com.sqx.modules.userSign.dto.UserSignDTO;
|
||||
import com.sqx.modules.userSign.service.UserSignRecordService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @author tankaikai
|
||||
* @since 2024-12-20 18:10
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class UserPrizeExchangeServiceImpl extends ServiceImpl<UserPrizeExchangeDao, UserPrizeExchange> implements UserPrizeExchangeService {
|
||||
|
||||
@Resource
|
||||
private DiscSpinningRecordDao discSpinningRecordDao;
|
||||
@Resource
|
||||
private DiscSpinningRecordService discSpinningRecordService;
|
||||
@Resource
|
||||
private TaskCenterRecordDao taskCenterRecordDao;
|
||||
@Resource
|
||||
private TaskCenterRewardDao taskCenterRewardDao;
|
||||
@Resource
|
||||
private CommonInfoService commonRepository;
|
||||
@Resource
|
||||
private UserMoneyService userMoneyService;
|
||||
@Resource
|
||||
private UserMoneyDetailsService userMoneyDetailsService;
|
||||
@Resource
|
||||
private UserSignRecordService userSignRecordService;
|
||||
|
||||
@Resource
|
||||
private UserDao userDao;
|
||||
|
||||
@Override
|
||||
public PageUtils page(Map<String, Object> params) {
|
||||
MapProxy proxy = MapProxy.create(params);
|
||||
Long foreignId = proxy.getLong("foreignId");
|
||||
String foreignType = proxy.getStr("foreignType");
|
||||
Long userId = proxy.getLong("userId");
|
||||
String userName = proxy.getStr("userName");
|
||||
String prizeName = proxy.getStr("prizeName");
|
||||
Integer status = proxy.getInt("status");
|
||||
String phone = proxy.getStr("phone");
|
||||
String remark = proxy.getStr("remark");
|
||||
String beginDate = proxy.getStr("beginDate");
|
||||
String endDate = proxy.getStr("endDate");
|
||||
LambdaQueryWrapper<UserPrizeExchange> wrapper = Wrappers.lambdaQuery();
|
||||
wrapper.eq(foreignId != null, UserPrizeExchange::getForeignId, foreignId);
|
||||
wrapper.eq(StrUtil.isNotEmpty(foreignType), UserPrizeExchange::getForeignType, foreignType);
|
||||
wrapper.eq(userId != null, UserPrizeExchange::getUserId, userId);
|
||||
wrapper.like(StrUtil.isNotEmpty(userName), UserPrizeExchange::getUserName, userName);
|
||||
wrapper.like(StrUtil.isNotEmpty(prizeName), UserPrizeExchange::getPrizeName, prizeName);
|
||||
wrapper.eq(status != null, UserPrizeExchange::getStatus, status);
|
||||
wrapper.like(StrUtil.isNotEmpty(phone), UserPrizeExchange::getPhone, phone);
|
||||
wrapper.like(StrUtil.isNotEmpty(remark), UserPrizeExchange::getRemark, remark);
|
||||
if (StrUtil.isNotEmpty(beginDate)) {
|
||||
wrapper.apply("create_time >= str_to_date({0}, '%Y-%m-%d %H:%i:%s')", beginDate + " 00:00:00");
|
||||
}
|
||||
if (StrUtil.isNotEmpty(endDate)) {
|
||||
wrapper.apply("create_time <= str_to_date({0}, '%Y-%m-%d %H:%i:%s')", endDate + " 23:59:59");
|
||||
}
|
||||
wrapper.orderByDesc(UserPrizeExchange::getId);
|
||||
long pageNum = proxy.getLong(Constant.PAGE, 1L);
|
||||
long pageSize = proxy.getLong(Constant.LIMIT, 10L);
|
||||
PageHelper.startPage((int) pageNum, (int) pageSize);
|
||||
return PageUtils.page(new PageInfo<>(this.list(wrapper)));
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void exchange(Long currentUserId, UserPrizeExchange dto) {
|
||||
if (dto.getForeignId() == null) {
|
||||
throw new SqxException("中奖记录ID不能为空");
|
||||
}
|
||||
if (StrUtil.isEmpty(dto.getForeignType())) {
|
||||
throw new SqxException("活动类型不能为空");
|
||||
}
|
||||
if (!ArrayUtil.contains(new String[]{"spinning", "task"}, dto.getForeignType())) {
|
||||
throw new SqxException("仅限大转盘、任务活动兑换奖品");
|
||||
}
|
||||
if (StrUtil.isBlank(dto.getPhone())) {
|
||||
throw new SqxException("用户手机号码不能为空");
|
||||
}
|
||||
try {
|
||||
Validator.isMobile(dto.getPhone());
|
||||
} catch (ValidateException e) {
|
||||
throw new SqxException("用户手机号码不合法");
|
||||
}
|
||||
Dict dict = Dict.create();
|
||||
if ("spinning".equals(dto.getForeignType())) {
|
||||
QueryWrapper<DiscSpinningRecord> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("id", dto.getForeignId());
|
||||
queryWrapper.eq("user_id", currentUserId);
|
||||
DiscSpinningRecord record = discSpinningRecordService.getOne(queryWrapper);
|
||||
if (record == null) {
|
||||
throw new SqxException("中奖记录不存在");
|
||||
}
|
||||
dict.put("userId", record.getUserId());
|
||||
dict.put("name", record.getName());
|
||||
dict.put("imgUrl", record.getImgUrl());
|
||||
dict.put("type", record.getType());
|
||||
} else if ("task".equals(dto.getForeignType())) {
|
||||
TaskCenterRecord record = taskCenterRecordDao.selectById(dto.getForeignId());
|
||||
if (record == null) {
|
||||
throw new SqxException("中奖记录不存在");
|
||||
}
|
||||
if (record.getSourceId() == null) {
|
||||
throw new SqxException("中奖记录未关联奖品");
|
||||
}
|
||||
TaskCenterReward reward = taskCenterRewardDao.selectById(record.getSourceId());
|
||||
if (reward == null) {
|
||||
throw new SqxException("对应的奖品信息不存在");
|
||||
}
|
||||
dict.put("userId", record.getUserId());
|
||||
dict.put("name", record.getName());
|
||||
dict.put("imgUrl", reward.getImg());
|
||||
dict.put("type", reward.getType());
|
||||
}
|
||||
Long userId = dict.getLong("userId");
|
||||
String name = dict.getStr("name");
|
||||
String imgUrl = dict.getStr("imgUrl");
|
||||
Integer type = dict.getInt("type");
|
||||
if (userId == null) {
|
||||
throw new SqxException("中奖用户数据不完整");
|
||||
}
|
||||
if (currentUserId == null) {
|
||||
throw new SqxException("未获取当前登录用户id");
|
||||
}
|
||||
if (!currentUserId.equals(userId)) {
|
||||
throw new SqxException("兑奖用户和获奖用户不一致");
|
||||
}
|
||||
UserEntity user = userDao.selectById(userId);
|
||||
if (user == null) {
|
||||
throw new SqxException("兑奖用户不存在");
|
||||
}
|
||||
if (ArrayUtil.contains(new int[]{1, 2}, type)) {
|
||||
throw new SqxException("仅限兑换实物、会员卡等奖项");
|
||||
}
|
||||
Integer count = baseMapper.selectCount(Wrappers.<UserPrizeExchange>lambdaQuery()
|
||||
.eq(UserPrizeExchange::getForeignId, dto.getForeignId())
|
||||
.eq(UserPrizeExchange::getForeignType, dto.getForeignType())
|
||||
);
|
||||
if (count != null && count > 0) {
|
||||
throw new SqxException("奖品已兑换,请勿重复操作");
|
||||
}
|
||||
dto.setPrizeName(name);
|
||||
dto.setUserId(userId);
|
||||
dto.setUserName(user.getUserName());
|
||||
dto.setStatus(0);
|
||||
dto.setCreateTime(new Date());
|
||||
dto.setImgUrl(imgUrl);
|
||||
baseMapper.insert(dto);
|
||||
if ("spinning".equals(dto.getForeignType())) {
|
||||
discSpinningRecordDao.update(null,
|
||||
Wrappers.<DiscSpinningRecord>lambdaUpdate()
|
||||
.set(DiscSpinningRecord::getTarget, "3")
|
||||
.set(DiscSpinningRecord::getTargetId, dto.getId())
|
||||
.eq(DiscSpinningRecord::getId, dto.getForeignId())
|
||||
);
|
||||
} else if ("task".equals(dto.getForeignType())) {
|
||||
taskCenterRecordDao.update(null,
|
||||
Wrappers.<TaskCenterRecord>lambdaUpdate()
|
||||
.set(TaskCenterRecord::getTargetId, dto.getId())
|
||||
.eq(TaskCenterRecord::getId, dto.getForeignId())
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deliver(UserPrizeExchange dto) {
|
||||
Long id = dto.getId();
|
||||
if (id == null) {
|
||||
throw new SqxException("兑奖id不能为空");
|
||||
}
|
||||
UserPrizeExchange entity = baseMapper.selectById(id);
|
||||
if (entity == null) {
|
||||
throw new SqxException("兑奖订单不存在");
|
||||
}
|
||||
entity.setStatus(1);
|
||||
if (StrUtil.isNotEmpty(dto.getAddress())) {
|
||||
entity.setAddress(dto.getAddress());
|
||||
}
|
||||
if (StrUtil.isNotEmpty(dto.getRemark())) {
|
||||
entity.setRemark(dto.getRemark());
|
||||
}
|
||||
entity.setUpdateTime(new Date());
|
||||
baseMapper.updateById(entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public synchronized void receive(Long currentUserId) {
|
||||
if (currentUserId == null) {
|
||||
throw new SqxException("未获取当前登录用户id");
|
||||
}
|
||||
UserEntity userEntity = userDao.selectById(currentUserId);
|
||||
if (userEntity == null) {
|
||||
throw new SqxException("该用户信息不存在");
|
||||
}
|
||||
CommonInfo one = commonRepository.findOne(918);
|
||||
if (one == null) {
|
||||
throw new SqxException("奖品配置信息不存在");
|
||||
}
|
||||
String value = one.getValue();
|
||||
String signDays = value.split(",")[0];
|
||||
String moneyStr = value.split(",")[1];
|
||||
UserSignDTO userSignData = userSignRecordService.getUserSignData(currentUserId);
|
||||
if (userSignData.getSignDays() < Convert.toInt(signDays)) {
|
||||
throw new SqxException(StrUtil.format("连续签到天数不足{}天,无法领取奖励", signDays));
|
||||
}
|
||||
int count = userMoneyDetailsService.count(
|
||||
Wrappers.<UserMoneyDetails>lambdaQuery()
|
||||
.eq(UserMoneyDetails::getUserId, currentUserId)
|
||||
.eq(UserMoneyDetails::getType, 1)
|
||||
.eq(UserMoneyDetails::getClassify, 7)
|
||||
.eq(UserMoneyDetails::getMoneyType, 1)
|
||||
.likeLeft(UserMoneyDetails::getTitle, "[连续签到")
|
||||
.likeRight(UserMoneyDetails::getTitle, "天]")
|
||||
);
|
||||
if (count > 0) {
|
||||
throw new SqxException("已经领取过连续签到奖励,无需重复操作");
|
||||
}
|
||||
BigDecimal money = new BigDecimal(moneyStr);
|
||||
userMoneyService.updateAmount(1, currentUserId, money.doubleValue());
|
||||
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
|
||||
userMoneyDetails.setUserId(currentUserId);
|
||||
userMoneyDetails.setTitle(StrUtil.format("[连续签到{}天]", signDays));
|
||||
userMoneyDetails.setContent("现金红包奖励:" + moneyStr + "元");
|
||||
// 充值
|
||||
userMoneyDetails.setType(1);
|
||||
// 任务领取
|
||||
userMoneyDetails.setClassify(7);
|
||||
userMoneyDetails.setMoney(money);
|
||||
userMoneyDetails.setCreateTime(DateUtil.now());
|
||||
userMoneyDetails.setMoneyType(1);
|
||||
userMoneyDetailsService.save(userMoneyDetails);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -17,9 +17,9 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipDao, UserVip> impleme
|
|||
return baseMapper.selectOne(queryWrapper);
|
||||
}
|
||||
|
||||
// @Scheduled(cron="0 */1 * * * ?")
|
||||
@Scheduled(cron="0 */1 * * * ?")
|
||||
public void getEndVip() {
|
||||
// baseMapper.updateUserVipByEndTime();
|
||||
baseMapper.updateUserVipByEndTime();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@ package com.sqx.modules.banner.controller.app;
|
|||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.banner.entity.Banner;
|
||||
|
|
@ -15,8 +13,6 @@ import lombok.extern.slf4j.Slf4j;
|
|||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author fang
|
||||
* @date 2020/7/9
|
||||
|
|
@ -42,10 +38,7 @@ public class AppBannerController {
|
|||
@ApiOperation("查询所有banner图")
|
||||
@ResponseBody
|
||||
public Result selectBannerPage(Integer page,Integer limit,Integer classify) {
|
||||
PageHelper.startPage(page,limit);
|
||||
List<Banner> classify1 = bannerService.list(new QueryWrapper<Banner>().eq("classify", classify));
|
||||
PageInfo<Banner> pageInfo = new PageInfo<>(classify1);
|
||||
return Result.success().put("data", PageUtils.page(pageInfo));
|
||||
return Result.success().put("data", new PageUtils(bannerService.page(new Page<>(page,limit),new QueryWrapper<Banner>().eq("classify",classify))));
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/clickBanner", method = RequestMethod.GET)
|
||||
|
|
@ -56,4 +49,4 @@ public class AppBannerController {
|
|||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,8 @@
|
|||
package com.sqx.modules.banner.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.sqx.modules.banner.entity.Banner;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
|
@ -17,8 +19,8 @@ public interface BannerDao extends BaseMapper<Banner> {
|
|||
|
||||
List<Banner> selectLists(@Param("classify") Integer classify);
|
||||
|
||||
// List<Banner> selectList(@Param("classify") Integer classify);
|
||||
List<Banner> selectList(@Param("classify") Integer classify);
|
||||
|
||||
List<Banner> selectBanner(@Param("classify") Integer classify);
|
||||
IPage<Banner> selectBannerPage(Page<Banner> page,@Param("classify") Integer classify);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@ package com.sqx.modules.banner.entity;
|
|||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
|
@ -16,7 +14,6 @@ import java.io.Serializable;
|
|||
@TableName("activity")
|
||||
public class Activity implements Serializable {
|
||||
@TableId(type = IdType.INPUT)
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long id;
|
||||
|
||||
private String createAt;
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
|
|||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import com.sqx.modules.course.entity.Course;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
|
|
@ -29,7 +27,6 @@ public class Banner implements Serializable {
|
|||
* banner图id
|
||||
*/
|
||||
@TableId(type = IdType.INPUT)
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
|
|
@ -56,10 +53,6 @@ public class Banner implements Serializable {
|
|||
* 分类 1 banner图 2 首页分类
|
||||
*/
|
||||
private Integer classify;
|
||||
/**
|
||||
* 跳转类型 1 内部 2 外部
|
||||
*/
|
||||
private Integer jumpType;
|
||||
|
||||
/**
|
||||
* 跳转地址
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
package com.sqx.modules.banner.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.banner.dao.BannerDao;
|
||||
|
|
@ -13,9 +13,6 @@ import com.sqx.modules.course.dao.CourseDao;
|
|||
import com.sqx.modules.course.dao.CourseDetailsDao;
|
||||
import com.sqx.modules.course.entity.Course;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.cache.annotation.CacheConfig;
|
||||
import org.springframework.cache.annotation.CacheEvict;
|
||||
import org.springframework.cache.annotation.Cacheable;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
|
|
@ -26,7 +23,6 @@ import java.util.List;
|
|||
* banner图
|
||||
*/
|
||||
@Service
|
||||
@CacheConfig(cacheNames = "banner")
|
||||
public class BannerServiceImpl extends ServiceImpl<BannerDao, Banner> implements BannerService {
|
||||
|
||||
@Autowired
|
||||
|
|
@ -38,26 +34,23 @@ public class BannerServiceImpl extends ServiceImpl<BannerDao, Banner> implements
|
|||
|
||||
|
||||
@Override
|
||||
@Cacheable(key = "#classify")
|
||||
public List<Banner> selectBannerList(Integer classify) {
|
||||
return bannerDao.selectList(new QueryWrapper<Banner>().eq("classify", classify).eq("state", 1).orderByDesc("sort"));
|
||||
return bannerDao.selectList(classify);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
@Cacheable(key = "#classify")
|
||||
public List<Banner> selectBannerLists(Integer classify) {
|
||||
return bannerDao.selectLists(classify);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageUtils selectBannerPage(Integer page, Integer limit, Integer classify) {
|
||||
PageHelper.startPage(page, limit);
|
||||
return PageUtils.page(new PageInfo<>(bannerDao.selectBanner(classify)));
|
||||
public PageUtils selectBannerPage(Integer page,Integer limit,Integer classify) {
|
||||
Page<Banner> pages=new Page<>(page,limit);
|
||||
return new PageUtils(bannerDao.selectBannerPage(pages,classify));
|
||||
}
|
||||
|
||||
@Override
|
||||
@CacheEvict(cacheNames = "banner", allEntries = true)
|
||||
public int saveBody(String image, String url, Integer sort) {
|
||||
Banner banner = new Banner();
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
|
|
@ -71,7 +64,6 @@ public class BannerServiceImpl extends ServiceImpl<BannerDao, Banner> implements
|
|||
}
|
||||
|
||||
@Override
|
||||
@CacheEvict(cacheNames = "banner", allEntries = true)
|
||||
public int insertBanner(Banner banner) {
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
Date now = new Date();
|
||||
|
|
@ -82,13 +74,12 @@ public class BannerServiceImpl extends ServiceImpl<BannerDao, Banner> implements
|
|||
|
||||
@Override
|
||||
public Result clickBanner(Integer bannerId, int page, int limit) {
|
||||
PageHelper.startPage(page, limit);
|
||||
Page<Course> page1 = new Page<>(page, limit);
|
||||
QueryWrapper<Course> queryWrapper = new QueryWrapper();
|
||||
//查询banner 对应短剧
|
||||
queryWrapper.eq("banner_id", bannerId);
|
||||
List<Course> coursePage = courseDao.selectList(queryWrapper);
|
||||
PageInfo<Course> pageInfo = new PageInfo<>(coursePage);
|
||||
return Result.success().put("data", PageUtils.page(pageInfo, true));
|
||||
IPage<Course> coursePage = courseDao.selectPage(page1, queryWrapper);
|
||||
return Result.success().put("data", coursePage);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -98,13 +89,11 @@ public class BannerServiceImpl extends ServiceImpl<BannerDao, Banner> implements
|
|||
}
|
||||
|
||||
@Override
|
||||
@CacheEvict(cacheNames = "banner", allEntries = true)
|
||||
public int deleteBannerById(Long id) {
|
||||
return bannerDao.deleteById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
@CacheEvict(cacheNames = "banner", allEntries = true)
|
||||
public Result updateBannerStateById(Long id) {
|
||||
Banner banner = selectBannerById(id);
|
||||
if (banner != null) {
|
||||
|
|
@ -121,7 +110,6 @@ public class BannerServiceImpl extends ServiceImpl<BannerDao, Banner> implements
|
|||
}
|
||||
|
||||
@Override
|
||||
@CacheEvict(cacheNames = "banner", allEntries = true)
|
||||
public int updateBannerById(Banner banner) {
|
||||
return bannerDao.updateById(banner);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
package com.sqx.modules.callback;
|
||||
import com.sqx.common.exception.CzgException;
|
||||
import com.sqx.modules.callback.service.UniAdCallbackRecordService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import com.sqx.modules.callback.dao.UniAdCallBackDTO;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/uniCallBack")
|
||||
@Slf4j
|
||||
public class UniCallBackController {
|
||||
private final UniAdCallbackRecordService uniCallBackService;
|
||||
|
||||
public UniCallBackController(UniAdCallbackRecordService uniCallBackService) {
|
||||
this.uniCallBackService = uniCallBackService;
|
||||
}
|
||||
|
||||
@GetMapping("/adCallBack")
|
||||
public ResponseEntity<?> adCallBack(@RequestParam String adpid, @RequestParam String provider,
|
||||
@RequestParam String platform, @RequestParam String sign, @RequestParam String trans_id,
|
||||
@RequestParam String user_id, @RequestParam(required = false) String extra) {
|
||||
UniAdCallBackDTO dto = new UniAdCallBackDTO();
|
||||
dto.setAdpid(adpid);
|
||||
dto.setProvider(provider);
|
||||
dto.setPlatform(platform);
|
||||
dto.setSign(sign);
|
||||
dto.setTrans_id(trans_id);
|
||||
dto.setUser_id(user_id);
|
||||
dto.setExtra(extra);
|
||||
log.info("接收到uni-ad广告完播回调,回调信息: {}", dto);
|
||||
return ResponseEntity.ok(uniCallBackService.adCallBack(dto));
|
||||
}
|
||||
|
||||
@GetMapping("/testException")
|
||||
public String testException() throws CzgException {
|
||||
throw new CzgException("测试异常");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
package com.sqx.modules.callback.dao;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.ToString;
|
||||
|
||||
@Data
|
||||
@ToString
|
||||
public class UniAdCallBackDTO {
|
||||
private String adpid;
|
||||
private String provider;
|
||||
private String platform;
|
||||
private String sign;
|
||||
private String trans_id;
|
||||
private String user_id;
|
||||
private String extra;
|
||||
}
|
||||
|
|
@ -1,146 +0,0 @@
|
|||
package com.sqx.modules.callback.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
*
|
||||
* @TableName uni_ad_callback_record
|
||||
*/
|
||||
@TableName(value ="uni_ad_callback_record")
|
||||
@Data
|
||||
public class UniAdCallbackRecord implements Serializable {
|
||||
/**
|
||||
*
|
||||
*/
|
||||
@TableId
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 用户id
|
||||
*/
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 平台
|
||||
*/
|
||||
private String platform;
|
||||
|
||||
/**
|
||||
* 交易id
|
||||
*/
|
||||
private String transId;
|
||||
|
||||
/**
|
||||
* DCloud广告位id
|
||||
*/
|
||||
private String adpid;
|
||||
|
||||
/**
|
||||
* 广告服务商
|
||||
*/
|
||||
private String provider;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private String sign;
|
||||
|
||||
/**
|
||||
* 调用SDK传入并透传,自定义数据
|
||||
*/
|
||||
private String extra;
|
||||
|
||||
/**
|
||||
* 是否播放完毕
|
||||
*/
|
||||
private Integer isEnded;
|
||||
|
||||
/**
|
||||
* 回调时间
|
||||
*/
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 错误信息
|
||||
*/
|
||||
private String errMsg;
|
||||
|
||||
@TableField(exist = false)
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Override
|
||||
public boolean equals(Object that) {
|
||||
if (this == that) {
|
||||
return true;
|
||||
}
|
||||
if (that == null) {
|
||||
return false;
|
||||
}
|
||||
if (getClass() != that.getClass()) {
|
||||
return false;
|
||||
}
|
||||
UniAdCallbackRecord other = (UniAdCallbackRecord) that;
|
||||
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
|
||||
&& (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
|
||||
&& (this.getPlatform() == null ? other.getPlatform() == null : this.getPlatform().equals(other.getPlatform()))
|
||||
&& (this.getTransId() == null ? other.getTransId() == null : this.getTransId().equals(other.getTransId()))
|
||||
&& (this.getAdpid() == null ? other.getAdpid() == null : this.getAdpid().equals(other.getAdpid()))
|
||||
&& (this.getProvider() == null ? other.getProvider() == null : this.getProvider().equals(other.getProvider()))
|
||||
&& (this.getSign() == null ? other.getSign() == null : this.getSign().equals(other.getSign()))
|
||||
&& (this.getExtra() == null ? other.getExtra() == null : this.getExtra().equals(other.getExtra()))
|
||||
&& (this.getIsEnded() == null ? other.getIsEnded() == null : this.getIsEnded().equals(other.getIsEnded()))
|
||||
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
|
||||
&& (this.getErrMsg() == null ? other.getErrMsg() == null : this.getErrMsg().equals(other.getErrMsg()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
|
||||
result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
|
||||
result = prime * result + ((getPlatform() == null) ? 0 : getPlatform().hashCode());
|
||||
result = prime * result + ((getTransId() == null) ? 0 : getTransId().hashCode());
|
||||
result = prime * result + ((getAdpid() == null) ? 0 : getAdpid().hashCode());
|
||||
result = prime * result + ((getProvider() == null) ? 0 : getProvider().hashCode());
|
||||
result = prime * result + ((getSign() == null) ? 0 : getSign().hashCode());
|
||||
result = prime * result + ((getExtra() == null) ? 0 : getExtra().hashCode());
|
||||
result = prime * result + ((getIsEnded() == null) ? 0 : getIsEnded().hashCode());
|
||||
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
|
||||
result = prime * result + ((getErrMsg() == null) ? 0 : getErrMsg().hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append(getClass().getSimpleName());
|
||||
sb.append(" [");
|
||||
sb.append("Hash = ").append(hashCode());
|
||||
sb.append(", id=").append(id);
|
||||
sb.append(", userId=").append(userId);
|
||||
sb.append(", platform=").append(platform);
|
||||
sb.append(", transId=").append(transId);
|
||||
sb.append(", adpid=").append(adpid);
|
||||
sb.append(", provider=").append(provider);
|
||||
sb.append(", sign=").append(sign);
|
||||
sb.append(", extra=").append(extra);
|
||||
sb.append(", isEnded=").append(isEnded);
|
||||
sb.append(", createTime=").append(createTime);
|
||||
sb.append(", errMsg=").append(errMsg);
|
||||
sb.append(", serialVersionUID=").append(serialVersionUID);
|
||||
sb.append("]");
|
||||
return sb.toString();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
package com.sqx.modules.callback.mapper;
|
||||
|
||||
import com.sqx.modules.callback.entity.UniAdCallbackRecord;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @author Administrator
|
||||
* @description 针对表【uni_ad_callback_record】的数据库操作Mapper
|
||||
* @createDate 2024-12-23 10:37:52
|
||||
* @Entity com.sqx.modules.callback.entity.UniAdCallbackRecord
|
||||
*/
|
||||
@Mapper
|
||||
public interface UniAdCallbackRecordMapper extends BaseMapper<UniAdCallbackRecord> {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
package com.sqx.modules.callback.service;
|
||||
|
||||
import com.sqx.modules.callback.dao.UniAdCallBackDTO;
|
||||
import com.sqx.modules.callback.entity.UniAdCallbackRecord;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @author Administrator
|
||||
* @description 针对表【uni_ad_callback_record】的数据库操作Service
|
||||
* @createDate 2024-12-23 10:37:52
|
||||
*/
|
||||
public interface UniAdCallbackRecordService extends IService<UniAdCallbackRecord> {
|
||||
|
||||
Map<String, Object> adCallBack(UniAdCallBackDTO callBackDTO);
|
||||
|
||||
HashMap<String, Object> getStateByExtraKey(Long userId, String extraKey);
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue