From f0f0387d462e357b537f0a6c0c9e65360fe41dd8 Mon Sep 17 00:00:00 2001 From: caojianbin <1910336823> Date: Mon, 30 Dec 2024 14:55:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AF=9D=E8=AE=B0=E5=BD=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/DeviceStepDailyController.java | 3 ++- .../internationalize/app/entity/DeviceStepDaily.java | 5 +++++ .../app/entity/dto/DeviceVideoRecordQuery.java | 4 ++++ .../app/service/impl/BindingDeviceImpl.java | 10 ++++++++-- .../app/service/impl/DeviceVideoAppServiceImpl.java | 2 +- .../com/ecell/internationalize/app/task/AppKafkaTask.java | 15 +++++++++++---- .../app/mapper/DeviceVideoRecordAppMapper.xml | 2 ++ 7 files changed, 33 insertions(+), 8 deletions(-) diff --git a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/controller/DeviceStepDailyController.java b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/controller/DeviceStepDailyController.java index f309d35..c9331fb 100644 --- a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/controller/DeviceStepDailyController.java +++ b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/controller/DeviceStepDailyController.java @@ -51,10 +51,11 @@ public class DeviceStepDailyController { //日期格式化 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); Date lastSevenDay = DateUtils.addDays(new Date(), -7); + System.out.println("获取到的日期==="+lastSevenDay); String formatDate = simpleDateFormat.format(lastSevenDay); String date=simpleDateFormat.format(new Date()); LambdaQueryWrapper lambdaQueryWrapper=new LambdaQueryWrapper<>(); - + System.out.println("获取到的一个星期的日期是："+formatDate+"====="+"获取到今天的日期是===="+date); lambdaQueryWrapper.gt(DeviceStepDaily::getCreateTime,formatDate); lambdaQueryWrapper.le(DeviceStepDaily::getCreateTime,date); diff --git a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/entity/DeviceStepDaily.java b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/entity/DeviceStepDaily.java index 2ff3c67..ad7d0fa 100644 --- a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/entity/DeviceStepDaily.java +++ b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/entity/DeviceStepDaily.java @@ -1,5 +1,6 @@ package com.ecell.internationalize.app.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -46,5 +47,9 @@ private static final long serialVersionUID=1L; private Date createTime; + @ApiModelProperty(example = "创建时间") + private Date updateTime; + + } diff --git a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/entity/dto/DeviceVideoRecordQuery.java b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/entity/dto/DeviceVideoRecordQuery.java index 05bc9ff..eed075a 100644 --- a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/entity/dto/DeviceVideoRecordQuery.java +++ b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/entity/dto/DeviceVideoRecordQuery.java @@ -29,6 +29,10 @@ private static final long serialVersionUID=1L; @ApiModelProperty(example = "设备名称") private String name; + + @ApiModelProperty(example = "requestType为 downVideoCallWithWatch 就是APP打给手表，如果 requestType为upVideoCallWithAPP就是手表打给APP ") + private String requestType; + @ApiModelProperty(example = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date createTime; diff --git a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/service/impl/BindingDeviceImpl.java b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/service/impl/BindingDeviceImpl.java index 4d3d77c..835ea9d 100644 --- a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/service/impl/BindingDeviceImpl.java +++ b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/service/impl/BindingDeviceImpl.java @@ -397,10 +397,16 @@ public class BindingDeviceImpl implements BindingDevice { UserService userService = SpringUtils.getBean(UserService.class); User user = userService.getBaseMapper().selectById(userId); if (StringUtils.isNotNull(user)){ - if (!user.getPhone().equals(dto.getMy_phone())){ + if (StringUtils.isNotNull(user.getPhone())){ + if (!user.getPhone().equals(dto.getMy_phone())){ + user.setPhone(dto.getMy_phone()); + + } + }else { user.setPhone(dto.getMy_phone()); - userService.getBaseMapper().updateById(user); } + userService.getBaseMapper().updateById(user); + } //============================================================ diff --git a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/service/impl/DeviceVideoAppServiceImpl.java b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/service/impl/DeviceVideoAppServiceImpl.java index 2215321..171d8a8 100644 --- a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/service/impl/DeviceVideoAppServiceImpl.java +++ b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/service/impl/DeviceVideoAppServiceImpl.java @@ -332,7 +332,7 @@ public class DeviceVideoAppServiceImpl extends ServiceImplApp/手表 + //手表<==>App/手表 手表打给APP if (CommonConstant.UP_VIDEO_CALL_WITH_APP.equals(type)){ deviceVideoRecordApp.setRequestType(CommonConstant.UP_VIDEO_CALL_WITH_APP); //手表<==>APP diff --git a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/task/AppKafkaTask.java b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/task/AppKafkaTask.java index bceab30..04a2db5 100644 --- a/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/task/AppKafkaTask.java +++ b/ecell-internationalize/ecell-internationalize-app/src/main/java/com/ecell/internationalize/app/task/AppKafkaTask.java @@ -5,6 +5,7 @@ import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ecell.internationalize.app.entity.*; import com.ecell.internationalize.app.entity.dto.DeviceInfoDTO; import com.ecell.internationalize.app.entity.dto.HeartTemperatureAbnormal; @@ -1284,11 +1285,14 @@ public class AppKafkaTask implements Callable { lambdaQueryWrapper.eq(DeviceStepDaily::getImei, imei); //日期格式化 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); - String date = simpleDateFormat.format(new Date()); + Date date1 = new Date(); + String date = simpleDateFormat.format(date1); + System.out.println("获取到步数的时间是：======="+date); lambdaQueryWrapper.eq(DeviceStepDaily::getCreateTime, date); try { //2.1.首先根据imei号和当前时间查询是否存在，存在则更新 - DeviceStepDaily deviceStepDaily = ApplicationUtil.getApplicationContext().getBean(DeviceStepDailyService.class).getBaseMapper().selectOne(lambdaQueryWrapper); + DeviceStepDailyService bean = ApplicationUtil.getApplicationContext().getBean(DeviceStepDailyService.class); + DeviceStepDaily deviceStepDaily = bean.getBaseMapper().selectOne(lambdaQueryWrapper); //2.2.获取设备用户体重 LambdaQueryWrapper lambdaQueryWrapper1 = new LambdaQueryWrapper<>(); lambdaQueryWrapper1.eq(DeviceOwnerInfoApp::getImei, imei); @@ -1301,7 +1305,9 @@ public class AppKafkaTask implements Callable { deviceStepDaily.setWalksNum(Integer.valueOf(step)); deviceStepDaily.setWalksDistance(distanceAndCalorie.get("distance").intValue()); deviceStepDaily.setWalksCalorie(distanceAndCalorie.get("calorie").intValue()); - ApplicationUtil.getApplicationContext().getBean(DeviceStepDailyService.class).getBaseMapper().updateById(deviceStepDaily); + deviceStepDaily.setUpdateTime(date1); + bean.getBaseMapper().updateById(deviceStepDaily); + } else { //新增 Date sqlDate = simpleDateFormat.parse(date); @@ -1312,7 +1318,8 @@ public class AppKafkaTask implements Callable { deviceStepDaily1.setWalksNum(Integer.valueOf(step)); deviceStepDaily1.setWalksDistance(distanceAndCalorie.get("distance").intValue()); deviceStepDaily1.setWalksCalorie(distanceAndCalorie.get("calorie").intValue()); - ApplicationUtil.getApplicationContext().getBean(DeviceStepDailyService.class).getBaseMapper().insert(deviceStepDaily1); + deviceStepDaily1.setUpdateTime(date1); + bean.getBaseMapper().insert(deviceStepDaily1); } } catch (Exception e) { e.printStackTrace(); diff --git a/ecell-internationalize/ecell-internationalize-app/src/main/resources/com/ecell/internationalize/app/mapper/DeviceVideoRecordAppMapper.xml b/ecell-internationalize/ecell-internationalize-app/src/main/resources/com/ecell/internationalize/app/mapper/DeviceVideoRecordAppMapper.xml index dc548e0..b215106 100644 --- a/ecell-internationalize/ecell-internationalize-app/src/main/resources/com/ecell/internationalize/app/mapper/DeviceVideoRecordAppMapper.xml +++ b/ecell-internationalize/ecell-internationalize-app/src/main/resources/com/ecell/internationalize/app/mapper/DeviceVideoRecordAppMapper.xml @@ -22,10 +22,12 @@ id, imei, user_id, create_time, status, video_id, duration, type, start_time, end_time, wait_duration, call_type + +