From 9f2e87265aa1c59d3b8bdde8e47a4d8e517d4d24 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Fri, 24 Sep 2021 00:28:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5=E7=BC=93?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cowr/ssjygl/overall/OverallService.java | 2 +- .../ssjygl/stat/sale/OrderStatService.java | 12 ++++----- .../com/cowr/local/ssjygl/main/Config.java | 2 +- .../ssjygl/overall/OverallCacheService.java | 22 ++++++++++++++++ .../ssjygl/overall/OverallController.java | 26 +++++++++++++++++-- 5 files changed, 54 insertions(+), 10 deletions(-) create mode 100644 ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/overall/OverallCacheService.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java index 32e1ee7..8e36f4c 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java @@ -11,7 +11,7 @@ import java.math.BigDecimal; import java.util.*; public class OverallService { - public static OverallService me = new OverallService(); + public static OverallService me = new OverallService(); /* /overall/stat?token= diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java index 81c76aa..f3a0e50 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java @@ -2225,12 +2225,12 @@ public class OrderStatService { " and t.verify_time > ? \n" + " group by t.customer_id \n" + " ) a on c.id = a.customer_id \n\n" + - " left join (\n" + - " select t.customer_id, sum(t.amount) total_amount from refund_detail t \n" + - " where t.state = 3 \n" + - " and t.verify_time > ? \n" + - " group by t.customer_id\n" + - " ) b on c.id = b.customer_id " + + " left join (\n" + + " select t.customer_id, sum(t.amount) total_amount from refund_detail t \n" + + " where t.state = 3 \n" + + " and t.verify_time > ? \n" + + " group by t.customer_id\n" + + " ) b on c.id = b.customer_id " + " left join customer_type tp on tp.id = c.customer_type_id\n" + " left join prepay_customer p on p.customer_id = c.id\n" + " where " + cidsql + " a.customer_id is not null \n" + // 查询时间段内有购砂、起始时间年内有充值的 diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java index 7af9e7d..2bb1074 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java @@ -103,7 +103,7 @@ public class Config extends JFinalConfig { public static DeviceThread deviceThread = new DeviceThread(); public static SocketIOService socketio = null; private static boolean client_run = true; - public static final String CLINET_VERSION = "20210415"; + public static final String CLINET_VERSION = "20210923"; public static String getRootPath() { return PathKit.getWebRootPath() diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/overall/OverallCacheService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/overall/OverallCacheService.java new file mode 100644 index 0000000..12bbe66 --- /dev/null +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/overall/OverallCacheService.java @@ -0,0 +1,22 @@ +package com.cowr.service.ssjygl.overall; + +import com.cowr.common.Const; +import com.cowr.service.ssjygl.main.Config; + +public class OverallCacheService extends com.cowr.ssjygl.overall.OverallService { + public static OverallCacheService me = new OverallCacheService(); + public static final String tablename = "overall"; + + public String redisbasekey() { + return Config.dbprop.get("database.basekey") + Const.REDIS_SEPARATE + tablename + Const.REDIS_SEPARATE; + } + + public String rediskey(Object key) { + return redisbasekey() + key; + } + + + public String overallmapkey(Object key) { + return rediskey("overallmapkey" + Const.REDIS_SEPARATE + key); + } +} diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/overall/OverallController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/overall/OverallController.java index e9ede3b..6fff83b 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/overall/OverallController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/overall/OverallController.java @@ -4,10 +4,24 @@ import com.cowr.common.view.Result; import com.cowr.model.Sysuser; import com.cowr.ssjygl.overall.OverallService; import com.jfinal.core.Controller; +import com.jfinal.plugin.activerecord.Record; +import com.jfinal.plugin.redis.Redis; + +import java.util.List; public class OverallController extends Controller { + private static final int statExpireAt = 600; // 超时时间，单位秒 + public void stat() { - renderJson(Result.success(OverallService.me.stat(null))); + String key = OverallCacheService.me.overallmapkey("stat"); + Record cachedata = Redis.use().get(key); + if (cachedata == null) { + cachedata = OverallCacheService.me.stat(null); + + Redis.use().setex(key, statExpireAt, cachedata); + } + + renderJson(Result.success(cachedata)); } public void lastStat() { @@ -33,7 +47,15 @@ public class OverallController extends Controller { public void lastOrder() { Integer supermarket_id = getInt("supermarket_id"); - renderJson(Result.success(OverallService.me.lastOrder(supermarket_id))); + String key = OverallCacheService.me.overallmapkey("lastOrder_" + supermarket_id); + List cachedata = Redis.use().get(key); + if (cachedata == null) { + cachedata = OverallService.me.lastOrder(supermarket_id); + + Redis.use().setex(key, statExpireAt, cachedata); + } + + renderJson(Result.success(cachedata)); } public void customerQuota() {