From fb72b59f978f36fc2f365750c7d7fae52254e349 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sat, 14 Sep 2024 15:57:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?spy=20sql=E6=97=A5=E5=BF=97=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++--- src/main/resources/spy.properties | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/spy.properties diff --git a/pom.xml b/pom.xml index 3dd634a..9979ab4 100644 --- a/pom.xml +++ b/pom.xml @@ -26,9 +26,9 @@ 2.5.1 - com.github.gavlyukovskiy - p6spy-spring-boot-starter - 1.7.1 + p6spy + p6spy + 3.8.2 org.apache.commons diff --git a/src/main/resources/spy.properties b/src/main/resources/spy.properties new file mode 100644 index 0000000..b8fb442 --- /dev/null +++ b/src/main/resources/spy.properties @@ -0,0 +1,30 @@ +# p6spy ?????????? +modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory +# ??????? +logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger +#???????? +#appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger +# ???????? sql +appender=com.p6spy.engine.spy.appender.Slf4JLogger + +logfile=sql.log +# ?? p6spy driver ?? +#deregisterdrivers=true +# ??JDBC URL?? +useprefix=true +# ???? Log ??,????????error,info,batch,debug,statement,commit,rollback,result,resultset. +excludecategories=info,debug,result,commit,resultset +# ???? +dateformat=yyyy-MM-dd HH:mm:ss +# SQL???????? +databaseDialectTimestampFormat=yyyy-MM-dd HH:mm:ss +# ??????? +#driverlist=org.h2.Driver +# ?????SQL?? +outagedetection=true +# ?SQL???? 2 ? +outagedetectioninterval=2 +# ???? Log +filter=true +# ?? Log ????? sql ????????? +exclude=SELECT 1 From 654920113f48385583bc53d31ab4642e93999c26 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sat, 14 Sep 2024 16:59:15 +0800 Subject: [PATCH 2/5] =?UTF-8?q?spy=20sql=E6=97=A5=E5=BF=97=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/spy.properties | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/resources/spy.properties b/src/main/resources/spy.properties index b8fb442..50ebcbc 100644 --- a/src/main/resources/spy.properties +++ b/src/main/resources/spy.properties @@ -1,30 +1,30 @@ -# p6spy ?????????? +#指定要加载的模块列表 modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory -# ??????? +#日志消息格式的实现类 logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger -#???????? +#指定日志输出 到控制台。 #appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger -# ???????? sql +#指定日志输出到 SLF4J 日志框架 appender=com.p6spy.engine.spy.appender.Slf4JLogger - +#定义日志文件的名称。 logfile=sql.log -# ?? p6spy driver ?? +#是否注销 JDBC 驱动程序（默认不注销） #deregisterdrivers=true -# ??JDBC URL?? +#设置是否在日志消息前添加前缀 useprefix=true -# ???? Log ??,????????error,info,batch,debug,statement,commit,rollback,result,resultset. +#指定要排除的日志类别，不记录这些类别的日志 excludecategories=info,debug,result,commit,resultset -# ???? +#设置日志条目的日期时间格式 dateformat=yyyy-MM-dd HH:mm:ss -# SQL???????? +#定义数据库方言的时间戳格式。 databaseDialectTimestampFormat=yyyy-MM-dd HH:mm:ss -# ??????? +#指定 JDBC 驱动程序列表 #driverlist=org.h2.Driver -# ?????SQL?? +#启用故障检测 outagedetection=true -# ?SQL???? 2 ? +#设置故障检测的时间间隔（单位：分钟） outagedetectioninterval=2 -# ???? Log +#启用 SQL 过滤功能 filter=true -# ?? Log ????? sql ????????? +#排除记录包含 "SELECT 1" 的 SQL 查询 exclude=SELECT 1 From ebcc80d71af91dfa5a2ef228df4797992cf2b3f7 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sat, 14 Sep 2024 17:03:02 +0800 Subject: [PATCH 3/5] =?UTF-8?q?spy=20sql=E6=97=A5=E5=BF=97=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/spy.properties | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/spy.properties b/src/main/resources/spy.properties index 50ebcbc..1a0d1db 100644 --- a/src/main/resources/spy.properties +++ b/src/main/resources/spy.properties @@ -2,10 +2,12 @@ modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory #日志消息格式的实现类 logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger -#指定日志输出 到控制台。 +#指定日志输出 到控制台 #appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger #指定日志输出到 SLF4J 日志框架 -appender=com.p6spy.engine.spy.appender.Slf4JLogger +#appender=com.p6spy.engine.spy.appender.Slf4JLogger +#指定日志输出到 file文件 +appender=com.p6spy.engine.spy.appender.FileLogger #定义日志文件的名称。 logfile=sql.log #是否注销 JDBC 驱动程序（默认不注销） From 33650aad94a2135784dd9e89e256126ff99f6ca8 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 20 Sep 2024 10:42:19 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BA=A4=E7=8F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommonController.java | 15 ++++++++++++++- .../cashierservice/interceptor/CustomFilter.java | 6 +++++- .../netty/PushToClientChannelHandlerAdapter.java | 13 +++++++++++++ .../cashierservice/service/ProductService.java | 3 --- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java index ae9f246..fb3e848 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java @@ -1,12 +1,13 @@ package com.chaozhanggui.system.cashierservice.controller; -import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; import com.chaozhanggui.system.cashierservice.dao.TbPlatformDictMapper; import com.chaozhanggui.system.cashierservice.dao.TbShopExtendMapper; import com.chaozhanggui.system.cashierservice.entity.TbPlatformDict; import com.chaozhanggui.system.cashierservice.entity.dto.WxMsgSubDTO; import com.chaozhanggui.system.cashierservice.entity.vo.DistrictVo; import com.chaozhanggui.system.cashierservice.exception.MsgException; +import com.chaozhanggui.system.cashierservice.netty.PushToClientChannelHandlerAdapter; import com.chaozhanggui.system.cashierservice.redis.RedisCst; import com.chaozhanggui.system.cashierservice.redis.RedisUtil; import com.chaozhanggui.system.cashierservice.service.FileService; @@ -174,6 +175,18 @@ public class CommonController { return new Result(CodeEnum.SUCCESS, extendMapper.queryByShopIdAndAutoKey(Integer.valueOf(map.get("shopId").toString()),map.get("autokey"))); } + /** + * 交班 + */ + @GetMapping("common/handoverData") + public Result handoverData(String shopId) { + JSONObject jsonObject1 = new JSONObject(); + jsonObject1.put("type", "handover"); + PushToClientChannelHandlerAdapter.getInstance().AppSendInfo(jsonObject1.toString(),shopId); + + return Result.success(CodeEnum.SUCCESS); + } + // 检查手机号格式是否正确的方法 private boolean isValidPhoneNumber(String phone) { return phone.matches("^1[3-9]\\d{9}$"); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/interceptor/CustomFilter.java b/src/main/java/com/chaozhanggui/system/cashierservice/interceptor/CustomFilter.java index b79a877..5e8bb65 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/interceptor/CustomFilter.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/interceptor/CustomFilter.java @@ -14,7 +14,11 @@ import java.util.List; @WebFilter(urlPatterns = {"/cashierService/*"},filterName = "customFilter") public class CustomFilter implements Filter { - private static final List unFilterUrlList= Arrays.asList("/cashierService/notify/notifyCallBack","/cashierService/notify/memberInCallBack"); + private static final List unFilterUrlList = + Arrays.asList( + "/cashierService/notify/notifyCallBack", + "/cashierService/notify/memberInCallBack" + ); private boolean isfilter(String url){ diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/netty/PushToClientChannelHandlerAdapter.java b/src/main/java/com/chaozhanggui/system/cashierservice/netty/PushToClientChannelHandlerAdapter.java index cedc930..b994d1a 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/netty/PushToClientChannelHandlerAdapter.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/netty/PushToClientChannelHandlerAdapter.java @@ -160,6 +160,19 @@ public class PushToClientChannelHandlerAdapter extends NettyChannelHandlerAdapte }); } + @Async + public void AppSendInfo(String message, String shopId) { + log.info("长链接发送交班数据。"); + ConcurrentHashMap webSockets = webSocketMap.get(shopId); + if (webSockets != null) { + for (ChannelHandlerContext ctx : webSockets.values()) { + sendMesToApp(message, ctx); + } + } + } + + + //发送打印消息 有重发机制 public void AppSendInfoV1(String shopId, String orderNo, JSONObject message) { log.info("netty连接client 发送消息 shopId:{} clientId:{} userFlag:{} message:{}", shopId, message.get("orderInfo")); retryQueue.computeIfAbsent(shopId, k -> new ConcurrentLinkedQueue<>()).offer(message); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java index f96fb6c..e0bc950 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java @@ -391,9 +391,6 @@ public class ProductService { if (!CollectionUtils.isEmpty(products)) { products.parallelStream().forEach(it -> { TbShopUnit tbShopUnit = unitMapper.selectByPrimaryKey(Integer.valueOf(it.getUnitId())); - if (it.getName().equals("烤牛肉")) { - System.out.println("单位："+tbShopUnit.getName()); - } it.setUnitSnap(tbShopUnit != null ? tbShopUnit.getName() : ""); if(check){ List tbProductGroups = tbProductGroupMapper.selectByProductId(it.getShopId(), it.getId().toString()); From 4ab9490b457b69448f3de3e0433166071c3b4ef8 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 20 Sep 2024 16:09:36 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BA=A4=E7=8F=AD2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/controller/CommonController.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java index fb3e848..c826119 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/CommonController.java @@ -178,12 +178,9 @@ public class CommonController { /** * 交班 */ - @GetMapping("common/handoverData") - public Result handoverData(String shopId) { - JSONObject jsonObject1 = new JSONObject(); - jsonObject1.put("type", "handover"); - PushToClientChannelHandlerAdapter.getInstance().AppSendInfo(jsonObject1.toString(),shopId); - + @PostMapping("common/handoverData") + public Result handoverData(@RequestBody Map map) throws Exception{ + PushToClientChannelHandlerAdapter.getInstance().AppSendInfo(JSONObject.toJSONString(map),map.get("shopId")); return Result.success(CodeEnum.SUCCESS); }