From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑
---
springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/api/BraceletUserDataApi.java | 77 +++++++++++++++++++++++++++++++++-----
1 files changed, 67 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/api/BraceletUserDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/api/BraceletUserDataApi.java
index 775b11a..0d0d2a6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/api/BraceletUserDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/api/BraceletUserDataApi.java
@@ -13,7 +13,9 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@Slf4j
@RestController
@@ -223,10 +225,10 @@
*/
@GetMapping("/getData")
public R<IPage<BraceletUserDataDO>> getData(@RequestParam("pageNum") Integer pageNum,
- @RequestParam("pageSize") Integer pageSize,
- @RequestParam("communityId") String communityId,
- @RequestParam("userName") String userName,
- @RequestParam("phone") String phone)
+ @RequestParam("pageSize") Integer pageSize,
+ @RequestParam(value = "communityId",required = false) String communityId,
+ @RequestParam(value = "userName",required = false) String userName,
+ @RequestParam(value = "phone",required = false) String phone)
{
@@ -286,12 +288,12 @@
@GetMapping("/getEarlyWarningList")
public R<IPage<BraceletEarlyWarningDO>> getList(@RequestParam("pageNum") Integer pageNum,
@RequestParam("pageSize") Integer pageSize,
- @RequestParam("communityId") String communityId,
- @RequestParam("equipmentNumber") String equipmentNumber,
- @RequestParam("disposeUserId") String disposeUserId,
- @RequestParam("type") String type,
- @RequestParam("userName") String userName,
- @RequestParam("phone") String phone)
+ @RequestParam(value = "communityId",required = false) String communityId,
+ @RequestParam(value = "equipmentNumber",required = false) String equipmentNumber,
+ @RequestParam(value = "disposeUserId",required = false) String disposeUserId,
+ @RequestParam(value = "type",required = false) String type,
+ @RequestParam(value = "userName",required = false) String userName,
+ @RequestParam(value = "phone",required = false) String phone)
{
Page page=new Page();
page.setSize(pageSize);
@@ -323,6 +325,7 @@
return R.fail("id不能为空");
}
+ //忽略
if(StringUtils.equals(braceletEarlyWarningDO.getDisposeType(),"4"))
{
BraceletEarlyWarningDO da=new BraceletEarlyWarningDO();
@@ -389,5 +392,59 @@
+ /**********************************************************************************************************************************************
+ *
+ * 大屏居家养老
+ *
+ **********************************************************************************************************************************************/
+
+ /**
+ * 手环人数
+ * @return
+ */
+ @GetMapping("/getUserNum")
+ public R getUserNum(@RequestParam("communityId") String communityId)
+ {
+ return R.ok(braceletUserDataService.getUserNum(communityId));
+ }
+
+
+ /**
+ * 手环定位数据
+ */
+ @GetMapping("/getUserList")
+ public R getUserList(@RequestParam("communityId") String communityId)
+ {
+ return R.ok(braceletUserDataService.getUserList(communityId));
+ }
+
+
+ /**
+ * 获取手环预警次数
+ * @return
+ */
+ @GetMapping("/getWarningNum")
+ public R getWarningNum(@RequestParam("communityId") String communityId,
+ @RequestParam(value = "disposeType",required = false) String disposeType)
+ {
+ //未处理
+ Integer num1=braceletEarlyWarningService.getWarningNum(communityId,"1");
+ //已处理
+ Integer num2=braceletEarlyWarningService.getWarningNum(communityId,"2");
+ //处理中
+ Integer num4=braceletEarlyWarningService.getWarningNum(communityId,"3");
+ //忽略
+ Integer num3=braceletEarlyWarningService.getWarningNum(communityId,"4");
+
+ Map<String,Integer> map=new HashMap<>();
+ map.put("untreatedNum",num1);
+ map.put("processedNum",num2);
+ map.put("ignoreNum",num3);
+ map.put("beingProcessedNum",num4);
+
+ return R.ok(map);
+ }
+
+
}
--
Gitblit v1.7.1