金汇新增手环接口3

lidongdong

2023-11-02 2b5023684a60e5aff1888dadadb32758517a41fe

金汇新增手环接口3

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/bracelet/CommunityBraceletService.java

@@ -23,10 +23,9 @@
    @GetMapping("/braceletApi/getData")
    R getData(@RequestParam("pageNum") Integer pageNum,
              @RequestParam("pageSize") Integer pageSize,
              @RequestParam("communityId") String communityId,
              @RequestParam("userName") String userName,
              @RequestParam("phone") String phone);

              @RequestParam(value = "communityId",required = false)  String communityId,
              @RequestParam(value = "userName",required = false) String userName,
              @RequestParam(value = "phone",required = false) String phone);

    /**
     * 设备用户详情数据
@@ -62,12 +61,12 @@
    @GetMapping("/braceletApi/getEarlyWarningList")
    R 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);

    /**
     * 获取单个预警信息详情

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BraceletApi.java

@@ -81,9 +81,9 @@
    @GetMapping("getData")
    public R getData(@RequestParam("pageNum") Integer pageNum,
                     @RequestParam("pageSize") Integer pageSize,
                     @RequestParam("communityId") String communityId,
                     @RequestParam("userName") String userName,
                     @RequestParam("phone") String phone)
                     @RequestParam(value = "communityId",required = false)  String communityId,
                     @RequestParam(value = "userName",required = false) String userName,
                     @RequestParam(value = "phone",required = false) String phone)
    {
        return communityBraceletService.getData(pageNum,pageSize,communityId,userName,phone);
    }
@@ -276,11 +276,11 @@
    @GetMapping("getEarlyWarningList")
    public R getList(@RequestParam("pageNum") Integer pageNum,
                     @RequestParam("pageSize") Integer pageSize,
                     @RequestParam("communityId") String communityId,
                     @RequestParam("equipmentNumber") String equipmentNumber,
                     @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 = "type",required = false)  String type,
                     @RequestParam(value = "userName",required = false)  String userName,
                     @RequestParam(value = "phone",required = false)  String phone)
    {
        return communityBraceletService.getList(pageNum,pageSize,communityId,equipmentNumber,"",type,userName,phone);
    }

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiBraceletApi.java

@@ -44,8 +44,8 @@
    @GetMapping("getData")
    public R getData(@RequestParam("pageNum") Integer pageNum,
                     @RequestParam("pageSize") Integer pageSize,
                     @RequestParam("userName") String userName,
                     @RequestParam("phone") String phone)
                     @RequestParam(value = "userName",required = false) String userName,
                     @RequestParam(value = "phone",required = false) String phone)
    {
        return communityBraceletService.getData(pageNum,pageSize,getCommunityId()+"",userName,phone);
    }
@@ -239,10 +239,10 @@
    @GetMapping("getEarlyWarningList")
    public R getList(@RequestParam("pageNum") Integer pageNum,
                     @RequestParam("pageSize") Integer pageSize,
                     @RequestParam("equipmentNumber") String equipmentNumber,
                     @RequestParam("type") String type,
                     @RequestParam("userName") String userName,
                     @RequestParam("phone") String phone)
                     @RequestParam(value = "equipmentNumber",required = false)  String equipmentNumber,
                     @RequestParam(value = "type",required = false)  String type,
                     @RequestParam(value = "userName",required = false)  String userName,
                     @RequestParam(value = "phone",required = false)  String phone)
    {
        return communityBraceletService.getList(pageNum,pageSize,getCommunityId()+"",equipmentNumber,"",type,userName,phone);
    }
@@ -267,6 +267,7 @@
    @PostMapping("dispose")
    public R dispose(@RequestBody BraceletEarlyWarningDO braceletEarlyWarningDO)
    {
        braceletEarlyWarningDO.setCommunityId(getCommunityId()+"");
        return communityBraceletService.dispose(braceletEarlyWarningDO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_bracelet/src/main/java/com/panzhihua/service_bracelet/api/BraceletUserDataApi.java

@@ -224,9 +224,9 @@
    @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(value = "communityId",required = false)  String communityId,
                                                @RequestParam(value = "userName",required = false) String userName,
                                                @RequestParam(value = "phone",required = false) String phone)


    {
@@ -286,12 +286,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);