From c18ec3846c8483975de2224c1ecac9470e9b2804 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 16 八月 2023 19:21:36 +0800
Subject: [PATCH] 同步代码
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java
index 6b07807..a32a952 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java
@@ -179,7 +179,7 @@
}else {
// 查询广东全区域数据 查询广东所有的代理商
List<TAgent> tAgentList = tAgentService.selectList(new EntityWrapper<TAgent>()
- .eq("provinceCode", "440000"));
+ .eq("status", 1));
List<Integer> ids = tAgentList.stream().map(TAgent::getId).collect(Collectors.toList());
// 统计代理商
tAgentService.getDataStatisticsByIds(ids,model,map);
@@ -272,4 +272,32 @@
}
+ /**
+ * 获取语音播报
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/queryOrderBroadcast", method = RequestMethod.POST)
+ public Map<String, Object> queryOrderBroadcast(){
+ String newOrder = redisUtil.getValue("newOrder");
+ String cancelOrder = redisUtil.getValue("cancelOrder");
+ String lobbyOrder = redisUtil.getValue("lobbyOrder");
+ Map<String, Object> map = new HashMap<>();
+ boolean n = ToolUtil.isNotEmpty(newOrder) ? Boolean.valueOf(newOrder) : false;
+ boolean c = ToolUtil.isNotEmpty(cancelOrder) ? Boolean.valueOf(cancelOrder) : false;
+ boolean l = ToolUtil.isNotEmpty(lobbyOrder) ? Boolean.valueOf(lobbyOrder) : false;
+ map.put("newOrder", n);
+ map.put("cancelOrder", c);
+ map.put("lobbyOrder", l);
+ if(n){
+ redisUtil.setStrValue("newOrder", "false");
+ }
+ if(c){
+ redisUtil.setStrValue("cancelOrder", "false");
+ }
+ if(l){
+ redisUtil.setStrValue("lobbyOrder", "false");
+ }
+ return map;
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1