From 99a7f511e8513c3ac9d05dda0f5fcf7329357081 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Thu, 7 Aug 2025 17:34:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=81=E7=B2=89=E6=B6=88=E8=B4=B9=E9=87=91?= =?UTF-8?q?=E8=B1=86=E8=AF=A6=E6=83=85+=E7=9B=B4=E6=92=AD=E6=B6=88?= =?UTF-8?q?=E8=B4=B9=E8=83=8C=E5=8C=85=E7=A4=BC=E7=89=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/domain/vo/bean/BeanConsumeFan.java | 4 ++++ .../java/com/example/demo/domain/vo/bean/BeanConsumeLive.java | 2 ++ src/main/resources/application-test.yml | 11 +++++++---- src/main/resources/application.yml | 10 +++++----- src/main/resources/jindouMapper/BeanConsumeMapper.xml | 2 ++ src/main/resources/liveMapper/LiveMapper.xml | 1 + 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java index f36a2d9..22c4598 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java @@ -32,6 +32,10 @@ public class BeanConsumeFan { private String dept; //地区/分部 @ExcelProperty("金豆数量") private String beanNum; //金豆数量 + @ExcelProperty("免费金豆") + private String freeBean; //免费金豆 + @ExcelProperty("付费金豆") + private String buyBean; //付费金豆 @ExcelProperty("频道名称") private String channel; //频道名称（source_name） @ExcelProperty("消费方式") diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java index c5c3195..33c52eb 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java @@ -39,6 +39,8 @@ public class BeanConsumeLive { private String type; //类型 @ExcelProperty("礼物名称") private String gift; //礼物名称 + @ExcelProperty("是否为背包礼物") + private String isBackpack; @ExcelProperty("金豆数量") private String beanNum; //金豆数量 @ExcelProperty("频道名称") diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 5714912..df574ea 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -35,16 +35,19 @@ spring: data: redis: database: 0 - host: localhost - port: 6379 -# password: 123456 + host: 54.255.212.181 + port: 10703 + password: Ngc0FYUTA6h3wC5J lettuce: pool: max-active: 20 max-wait: -1 max-idle: 5 - +http://192: + 168: + 1: + 50:8081: file: upload: url: http://39.101.133.168:8828/hljw/api/aws/upload diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b41fea2..d4dabb8 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -68,11 +68,11 @@ spring: max-request-size: 10MB data: -# redis: -# database: 0 -# host: 18.143.76.3 -# port: 10703 -# password: Ngc0FYUTA6h3wC5J + redis: + database: 0 + host: 54.255.212.181 + port: 10703 + password: Ngc0FYUTA6h3wC5J lettuce: pool: diff --git a/src/main/resources/jindouMapper/BeanConsumeMapper.xml b/src/main/resources/jindouMapper/BeanConsumeMapper.xml index 624e158..1f2b051 100644 --- a/src/main/resources/jindouMapper/BeanConsumeMapper.xml +++ b/src/main/resources/jindouMapper/BeanConsumeMapper.xml @@ -129,6 +129,8 @@ fm.jwcode, fm.dept, fyr.money AS beanNum, + fyr.money_free AS freeBean, + fyr.money_buy AS buyBean, fyr.source_name AS channel, fyr.source_type AS type, FROM_UNIXTIME(fyr.time, '%Y-%m-%d %H:%i:%s') AS consumeTime, diff --git a/src/main/resources/liveMapper/LiveMapper.xml b/src/main/resources/liveMapper/LiveMapper.xml index 1f02287..9d5d10f 100644 --- a/src/main/resources/liveMapper/LiveMapper.xml +++ b/src/main/resources/liveMapper/LiveMapper.xml @@ -9,6 +9,7 @@ lgg.jwcode as jwcode, mi.deptName as dept, lg.name as gift, + lgg.knapsack as isBackpack, lgg.gold_beans as beanNum, lgg.gold_free as freeBean, lgg.gold_buy as buyBean,