接入智能手表

fs-service/src/main/java/com/fs/watch/domain/DeviceFamily.java

@@ -12,6 +12,8 @@ public class DeviceFamily {
     private String xhsDeviceId;
     //小护士手表
     private String newXhsDeviceId;
+    //智能手表
+    private String smartWatchDeviceId;
     //关系
     private String relationship;
 }

fs-service/src/main/java/com/fs/watch/domain/WatchFsUser.java

@@ -183,4 +183,7 @@ public class WatchFsUser extends BaseEntity {
     //小护士手表设备id
     private String newXhsDeviceId;
 
+    //智能手表设备id
+    private String smartWatchDeviceId;
+
 }

fs-service/src/main/java/com/fs/watch/domain/WatchUser.java

@@ -94,6 +94,9 @@ public class WatchUser implements Serializable {
     //小护士手表设备id
     private String newXhsDeviceId;
 
+    //智能手表设备id
+    private String smartWatchDeviceId;
+
 
 
     public String getTargetActivity() {
@@ -248,5 +251,13 @@ public class WatchUser implements Serializable {
     public void setNewXhsDeviceId(String newXhsDeviceId) {
         this.newXhsDeviceId = newXhsDeviceId;
     }
+
+    public String getSmartWatchDeviceId() {
+        return smartWatchDeviceId;
+    }
+
+    public void setSmartWatchDeviceId(String smartWatchDeviceId) {
+        this.smartWatchDeviceId = smartWatchDeviceId;
+    }
 }
 

fs-service/src/main/java/com/fs/watch/domain/vo/AppFsUserVo.java

@@ -125,5 +125,9 @@ public class AppFsUserVo {
 
     //小护士设备id
     private String xhsDeviceId;
+    //小护士手表设备id
+    private String newXhsDeviceId;
+    //智能手表设备id
+    private String smartWatchDeviceId;
 
 }

fs-service/src/main/java/com/fs/watch/service/WatchUserService.java

@@ -99,5 +99,5 @@ public interface WatchUserService {
 
     R editXHSDevice(HashMap<String, String> param);
 
-    R removeXHSDevice(String userId, String xhsDeviceId,String newXhsDeviceId);
+    R removeXHSDevice(String userId, String xhsDeviceId,String newXhsDeviceId,String smartWatchDeviceId);
 }

fs-service/src/main/java/com/fs/watch/service/impl/WatchDataServiceImpl.java

@@ -410,6 +410,8 @@ public class WatchDataServiceImpl implements WatchDataService {
                 user = userService.selectWatchFsUserByDeviceIdAndUserId(deviceId, userId, isFamily ? 3 : 2);
             }else if (deviceType == 2){
                 user = userService.selectWatchFsUserByDeviceIdAndUserId(deviceId, userId, isFamily ? 5: 4);
+            }else if (deviceType == 3){
+                user = userService.selectWatchFsUserByDeviceIdAndUserId(deviceId, userId, isFamily ? 7 : 6);
             }
             if (user != null) {
                 //处理电话
@@ -450,6 +452,9 @@ public class WatchDataServiceImpl implements WatchDataService {
             } else if (deviceType == 2) {
                 appInfoVo.setBle("小护士手表:" + deviceId);
                 appInfoVo.setStatus(3);
+            } else if (deviceType == 3) {
+                appInfoVo.setBle("智能手表:" + deviceId);
+                appInfoVo.setStatus(3);
             }
             vos.add(appInfoVo);
         }

fs-service/src/main/java/com/fs/watch/service/impl/WatchDeviceInfoServiceImpl.java

@@ -614,10 +614,9 @@ public class WatchDeviceInfoServiceImpl implements WatchDeviceInfoService {
         if (!oldList.isEmpty()){
             if (!newList.isEmpty()){
                 //新增部分
-//                final List<DeviceFamily> finalOldList = oldList;
                 newList.forEach(deviceFamily -> {
-                    String deviceIds = deviceFamily.getDeviceId();
-                    Arrays.stream(deviceIds.split(",")).forEach(deviceId -> {
+                    List<String> allDeviceIds = collectAllDeviceIds(deviceFamily);
+                    allDeviceIds.forEach(deviceId -> {
                         if (!oldOtherDevice.contains(deviceId)){
                             //不包含则新增
                             addFamilyUser(userId, deviceId);
@@ -628,8 +627,8 @@ public class WatchDeviceInfoServiceImpl implements WatchDeviceInfoService {
 
                 //移除部分
                 oldList.forEach(deviceFamily -> {
-                    String deviceIds = deviceFamily.getDeviceId();
-                    Arrays.stream(deviceIds.split(",")).forEach(deviceId -> {
+                    List<String> allDeviceIds = collectAllDeviceIds(deviceFamily);
+                    allDeviceIds.forEach(deviceId -> {
                         if (!newOtherDevice.contains(deviceId)){
                             //不包含则移除
                             subFamilyUser(userId, deviceId);
@@ -645,7 +644,10 @@ public class WatchDeviceInfoServiceImpl implements WatchDeviceInfoService {
             if (!newList.isEmpty()){
                 //全新增
                 newList.forEach(deviceFamily -> {
-                    addFamilyUser(userId, deviceFamily.getDeviceId());
+                    List<String> allDeviceIds = collectAllDeviceIds(deviceFamily);
+                    allDeviceIds.forEach(deviceId -> {
+                        addFamilyUser(userId, deviceId);
+                    });
                 });
             }
         }
@@ -723,9 +725,12 @@ public class WatchDeviceInfoServiceImpl implements WatchDeviceInfoService {
     private List<DeviceFamily> getValidFamilies(String str) {
         List<DeviceFamily> list = new ArrayList<>();
         if (StringUtils.isNotBlank(str)){
-            //去除没有Device的家人信息
+            //去除没有任何设备ID的家人信息
             JSONUtil.parseArray(str).toList(DeviceFamily.class).forEach(item->{
-                if (StringUtils.isNotBlank(item.getDeviceId())){
+                if (StringUtils.isNotBlank(item.getDeviceId())
+                        || StringUtils.isNotBlank(item.getXhsDeviceId())
+                        || StringUtils.isNotBlank(item.getNewXhsDeviceId())
+                        || StringUtils.isNotBlank(item.getSmartWatchDeviceId())){
                     list.add(item);
                 }
             });
@@ -733,6 +738,26 @@ public class WatchDeviceInfoServiceImpl implements WatchDeviceInfoService {
         return list;
     }
 
+    /**
+     * 收集DeviceFamily中所有类型的设备ID（普通腕表/小护士/小护士手表/智能手表）
+     */
+    private List<String> collectAllDeviceIds(DeviceFamily deviceFamily) {
+        List<String> ids = new ArrayList<>();
+        if (StringUtils.isNotBlank(deviceFamily.getDeviceId())) {
+            ids.addAll(Arrays.asList(deviceFamily.getDeviceId().split(",")));
+        }
+        if (StringUtils.isNotBlank(deviceFamily.getXhsDeviceId())) {
+            ids.addAll(Arrays.asList(deviceFamily.getXhsDeviceId().split(",")));
+        }
+        if (StringUtils.isNotBlank(deviceFamily.getNewXhsDeviceId())) {
+            ids.addAll(Arrays.asList(deviceFamily.getNewXhsDeviceId().split(",")));
+        }
+        if (StringUtils.isNotBlank(deviceFamily.getSmartWatchDeviceId())) {
+            ids.addAll(Arrays.asList(deviceFamily.getSmartWatchDeviceId().split(",")));
+        }
+        return ids;
+    }
+
     private void addFamilyUser(String userId, String deviceIds) {
             Arrays.stream(deviceIds.split(",")).forEach(deviceId->{
                 WatchDeviceInfo watchDeviceInfo = new WatchDeviceInfo();
@@ -783,8 +808,8 @@ public class WatchDeviceInfoServiceImpl implements WatchDeviceInfoService {
 
     private void subFamilyUser(String userId, List<DeviceFamily> list) {
         list.forEach(deviceFamily -> {
-            String deviceIds = deviceFamily.getDeviceId();
-            Arrays.stream(deviceIds.split(",")).forEach(deviceId->{
+            List<String> allDeviceIds = collectAllDeviceIds(deviceFamily);
+            allDeviceIds.forEach(deviceId->{
                 WatchDeviceInfoVo vo = getByNumber(deviceId);
                 if (vo != null){
                     //更新

fs-service/src/main/java/com/fs/watch/service/impl/WatchUserServiceImpl.java

@@ -191,6 +191,7 @@ public class WatchUserServiceImpl implements WatchUserService {
         watchUser.setDeviceId(watchFsUser.getDeviceId());
         watchUser.setXhsDeviceId(watchFsUser.getXhsDeviceId());
         watchUser.setNewXhsDeviceId(watchFsUser.getNewXhsDeviceId());
+        watchUser.setSmartWatchDeviceId(watchFsUser.getSmartWatchDeviceId());
         watchUser.setOtherDevice(watchFsUser.getOtherDevice());
         watchUser.setMonitorDataTypeOrder(watchFsUser.getMonitorDataTypeOrder());
         watchUser.setCreateTime(watchFsUser.getCreateTime());
@@ -343,6 +344,16 @@ public class WatchUserServiceImpl implements WatchUserService {
                         res.add(vo);
                         hasDevice = true;
                     }
+                    String smartWatchDeviceId = deviceFamily.getSmartWatchDeviceId();
+                    if (StringUtils.isNotBlank(smartWatchDeviceId)) {
+                        WatchInfoVo vo = new WatchInfoVo();
+                        BeanUtils.copyProperties(deviceFamily, vo);
+                        vo.setDeviceId(smartWatchDeviceId);
+                        vo.setBle("智能手表:" + deviceFamily.getSmartWatchDeviceId());
+                        vo.setStatus(3);
+                        res.add(vo);
+                        hasDevice = true;
+                    }
                     if (!hasDevice) {
                         WatchInfoVo vo = new WatchInfoVo();
                         BeanUtils.copyProperties(deviceFamily, vo);
@@ -406,6 +417,23 @@ public class WatchUserServiceImpl implements WatchUserService {
                     }
                 }
             }
+
+            String smartWatchDeviceId = user.getSmartWatchDeviceId();
+            if (StringUtils.isNotBlank(smartWatchDeviceId)) {
+                List<String> smartWatchDeviceIdList = Arrays.asList(smartWatchDeviceId.split(","));
+                if (!smartWatchDeviceIdList.isEmpty()) {
+                    for (String deId : smartWatchDeviceIdList) {
+                        WatchInfoVo vo = new WatchInfoVo();
+                        vo.setName("自己");
+                        vo.setRelationship("自己");
+
+                        vo.setDeviceId(deId);
+                        vo.setBle("智能手表:" + deId);
+                        vo.setStatus(3);
+                        res.add(vo);
+                    }
+                }
+            }
             if (res.isEmpty()) {
                 WatchInfoVo vo = new WatchInfoVo();
                 vo.setName("自己");
@@ -432,6 +460,7 @@ public class WatchUserServiceImpl implements WatchUserService {
         String userId = param.get("userId");
         String xhsDeviceId = param.get("xhsDeviceId");
         String newXhsDeviceId = param.get("newXhsDeviceId");
+        String smartWatchDeviceId = param.get("smartWatchDeviceId");
         //查询设备是否已经绑定自己
         long userIdL = Long.parseLong(userId);
         //1.编辑绑定设备 ,更新用户表
@@ -445,6 +474,9 @@ public class WatchUserServiceImpl implements WatchUserService {
             if (StringUtils.isNotBlank(newXhsDeviceId)) {
                 watchUser.setNewXhsDeviceId(newXhsDeviceId);
             }
+            if (StringUtils.isNotBlank(smartWatchDeviceId)) {
+                watchUser.setSmartWatchDeviceId(smartWatchDeviceId);
+            }
             insert(watchUser);
         } else {
             if (StringUtils.isNotBlank(xhsDeviceId)) {
@@ -463,6 +495,14 @@ public class WatchUserServiceImpl implements WatchUserService {
                     watchFsUser.setNewXhsDeviceId(deviceId + "," + newXhsDeviceId);
                 }
             }
+            if (StringUtils.isNotBlank(smartWatchDeviceId)) {
+                String deviceId = watchFsUser.getSmartWatchDeviceId();
+                if (StringUtils.isBlank(deviceId)) {
+                    watchFsUser.setSmartWatchDeviceId(smartWatchDeviceId);
+                } else {
+                    watchFsUser.setSmartWatchDeviceId(deviceId + "," + smartWatchDeviceId);
+                }
+            }
 
             WatchUser watchUser = setWatchUser(watchFsUser);
             //查询是否含有腕表用户信息
@@ -516,13 +556,37 @@ public class WatchUserServiceImpl implements WatchUserService {
                 deviceSetupService.insertDeviceSetup(deviceSetup);
             }
         }
+
+        if (StringUtils.isNotBlank(smartWatchDeviceId)) {
+            WatchDeviceSetup temp = deviceSetupService.selectDeviceSetupByDeviceId(smartWatchDeviceId);
+            if (temp == null) {
+                WatchDeviceSetup deviceSetup = new WatchDeviceSetup();
+                deviceSetup.setDeviceId(smartWatchDeviceId);
+                deviceSetup.setSmartDoctor(0);
+                deviceSetup.setSedentary(JSONUtil.toJsonStr(new DeviceSedentary()));
+                deviceSetup.setFallcheck(0);
+                deviceSetup.setHeartHealth(0);
+                deviceSetup.setHralarm(JSONUtil.toJsonStr(new DeviceHralarm()));
+                deviceSetup.setSpo2alarm(JSONUtil.toJsonStr(new DeviceSpo2alarm()));
+                deviceSetup.setAlarmClock(JSONUtil.toJsonStr(new DeviceAlarmClock()));
+                deviceSetup.setPower(JSONUtil.toJsonStr(new DevicePower()));
+                deviceSetup.setPhonebook(JSONUtil.toJsonStr(new DevicePhonebooks()));
+                deviceSetup.setTime(JSONUtil.toJsonStr(new DeviceTime()));
+                deviceSetup.setLcdgesture(JSONUtil.toJsonStr(new DeviceLcdgesture()));
+                deviceSetup.setUnit(JSONUtil.toJsonStr(new DeviceUnit()));
+                deviceSetup.setMode(JSONUtil.toJsonStr(new DeviceMode()));
+                deviceSetup.setVersion("1.1.0");
+                deviceSetupService.insertDeviceSetup(deviceSetup);
+            }
+        }
         return R.ok("绑定成功!");
     }
 
     @Override
-    public R removeXHSDevice(String userId, String xhsDeviceId,String newXhsDeviceId) {
+    public R removeXHSDevice(String userId, String xhsDeviceId,String newXhsDeviceId,String smartWatchDeviceId) {
         //1.编辑绑定设备 ,更新用户表
-        if (StringUtils.isNotBlank(xhsDeviceId) || StringUtils.isNotBlank(newXhsDeviceId)) {
+        if (StringUtils.isNotBlank(xhsDeviceId) || StringUtils.isNotBlank(newXhsDeviceId)
+                || StringUtils.isNotBlank(smartWatchDeviceId)) {
             Long userIdL = Long.valueOf(userId);
             //1.1判断该设备是否已经绑定
             WatchFsUser user = null;
@@ -530,6 +594,8 @@ public class WatchUserServiceImpl implements WatchUserService {
                 user = selectWatchFsUserByDeviceIdAndUserId(xhsDeviceId, userIdL, 2);
             } else if (StringUtils.isNotBlank(newXhsDeviceId)) {
                 user = selectWatchFsUserByDeviceIdAndUserId(newXhsDeviceId, userIdL, 4);
+            } else if (StringUtils.isNotBlank(smartWatchDeviceId)) {
+                user = selectWatchFsUserByDeviceIdAndUserId(smartWatchDeviceId, userIdL, 6);
             }
 
             if (user == null) {
@@ -573,6 +639,24 @@ public class WatchUserServiceImpl implements WatchUserService {
                         user.setNewXhsDeviceId(newDeviceIds.toString());
                     }
                 }
+            } else if (StringUtils.isNotBlank(smartWatchDeviceId)) {
+                String deviceIds = user.getSmartWatchDeviceId();
+
+                List<String> list = Arrays.asList(deviceIds.split(","));
+                if (!list.isEmpty()) {
+                    if (list.contains(smartWatchDeviceId)) {
+                        list = list.stream().filter(s -> !(smartWatchDeviceId.equals(s))).collect(Collectors.toList());
+                        StringBuilder newDeviceIds = new StringBuilder();
+                        for (int i = 0; i < list.size(); i++) {
+                            if (i == 0) {
+                                newDeviceIds.append(list.get(i));
+                            } else {
+                                newDeviceIds.append(",").append(list.get(i));
+                            }
+                        }
+                        user.setSmartWatchDeviceId(newDeviceIds.toString());
+                    }
+                }
             }
             WatchUser watchUser = new WatchUser();
             BeanUtils.copyProperties(user, watchUser);
@@ -588,7 +672,7 @@ public class WatchUserServiceImpl implements WatchUserService {
      *
      * @param deviceId
      * @param userId
-     * @param type     0:user 1:familyUser 2:xshUser 3:xhsFamilyUser  4:newXshUser 5:newXhsFamilyUser
+     * @param type     0:user 1:familyUser 2:xshUser 3:xhsFamilyUser  4:newXshUser 5:newXhsFamilyUser 6:smartWatchUser 7:smartWatchFamilyUser
      * @return
      */
     @Override
@@ -637,6 +721,8 @@ public class WatchUserServiceImpl implements WatchUserService {
                     user = selectWatchFsUserByDeviceIdAndUserId(deviceId, watchUserId, 2);
                 } else if (deviceType == 2) {
                     user = selectWatchFsUserByDeviceIdAndUserId(deviceId, watchUserId, 4);
+                } else if (deviceType == 3) {
+                    user = selectWatchFsUserByDeviceIdAndUserId(deviceId, watchUserId, 6);
                 }
 
                 if (user != null) {

fs-service/src/main/resources/mapper/watch/WatchUserMapper.xml

@@ -22,6 +22,7 @@
         <result property="nickName" column="nick_name" jdbcType="VARCHAR"/>
         <result property="xhsDeviceId" column="xhs_device_id" jdbcType="VARCHAR"/>
         <result property="newXhsDeviceId" column="new_xhs_device_id" jdbcType="VARCHAR"/>
+        <result property="smartWatchDeviceId" column="smart_watch_device_id" jdbcType="VARCHAR"/>
     </resultMap>
 
 
@@ -31,7 +32,7 @@
                wu.nick_name,
                wu.sex,wu.birthday,wu.w_company_id,wu.height,wu.weight,wu.target_step,wu.target_calorie,
                wu.target_activity,wu.target_sport,wu.device_id,wu.other_device,wu.monitor_data_type_order,
-               wu.xhs_device_id,wu.new_xhs_device_id
+               wu.xhs_device_id,wu.new_xhs_device_id,wu.smart_watch_device_id
         from watch_user wu
         LEFT JOIN fs_user u ON wu.user_id = u.user_id
         where wu.user_id = #{userId}
@@ -41,7 +42,7 @@
     <select id="queryAllByLimit" resultMap="WatchUserMap">
         select
         user_id,sex,birthday,w_company_id,height,weight,target_step,target_calorie,device_id,other_device,
-        monitor_data_type_order,create_time,update_time,is_del,nick_name,xhs_device_id,new_xhs_device_id
+        monitor_data_type_order,create_time,update_time,is_del,nick_name,xhs_device_id,new_xhs_device_id,smart_watch_device_id
         from watch_user
         <where>
             <if test="userId != null">
@@ -209,6 +210,25 @@
             left join fs_user u on u.user_id = #{userId}
             WHERE wu.device_id LIKE concat('%',#{deviceId},'%') AND wu.is_del = 0
         </if>
+        <if test="type==6">
+            SELECT u.user_id, u.avatar, u.password, u.sex, u.status, u.remark,u.phone,
+            wu.nick_name,
+            wu.sex,wu.birthday,wu.w_company_id,wu.height,wu.weight,wu.target_step,wu.target_calorie,
+            wu.target_activity,wu.target_sport,wu.device_id,wu.other_device,wu.monitor_data_type_order,wu.smart_watch_device_id
+            FROM watch_user wu
+            left join fs_user u on wu.user_id = u.user_id
+            WHERE wu.smart_watch_device_id LIKE concat('%',#{deviceId},'%') AND wu.is_del = 0
+            AND  wu.user_id = #{userId}
+        </if>
+        <if test="type==7">
+            SELECT u.user_id, u.avatar, u.password, u.sex, u.status, u.remark,u.phone,
+            wu.nick_name,
+            wu.sex,wu.birthday,wu.height,wu.weight,wu.target_step,wu.target_calorie,
+            wu.target_activity,wu.target_sport,wu.device_id as smart_watch_device_id,wu.monitor_data_type_order
+            FROM watch_family_user wu
+            left join fs_user u on u.user_id = #{userId}
+            WHERE wu.device_id LIKE concat('%',#{deviceId},'%') AND wu.is_del = 0
+        </if>
 
     </select>
 
@@ -257,6 +277,8 @@
             <if test="updateTime != null">update_time,</if>
             <if test="isDel != null">is_del,</if>
             <if test="xhsDeviceId != null">xhs_device_id,</if>
+            <if test="newXhsDeviceId != null">new_xhs_device_id,</if>
+            <if test="smartWatchDeviceId != null">smart_watch_device_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -277,6 +299,8 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="isDel != null">#{isDel},</if>
             <if test="xhsDeviceId != null">#{xhsDeviceId},</if>
+            <if test="newXhsDeviceId != null">#{newXhsDeviceId},</if>
+            <if test="smartWatchDeviceId != null">#{smartWatchDeviceId},</if>
         </trim>
     </insert>
 
@@ -340,6 +364,9 @@
             <if test="newXhsDeviceId != null">
                 new_xhs_device_id = #{newXhsDeviceId},
             </if>
+            <if test="smartWatchDeviceId != null">
+                smart_watch_device_id = #{smartWatchDeviceId},
+            </if>
         </set>
         where user_id = #{userId}
     </update>

fs-watch/src/main/java/com/fs/app/controller/WatchUserController.java

@@ -246,6 +246,19 @@ public class WatchUserController extends AppBaseController {
                             }
                         });
                     }
+                    // 智能手表
+                    String smartWatchDeviceIds = deviceFamily.getSmartWatchDeviceId();
+                    if (StringUtils.isNotBlank(smartWatchDeviceIds)) {
+                        Arrays.asList(smartWatchDeviceIds.split(",")).forEach(deviceId->{
+                            //查询该设备是否已存在家人信息
+                            WatchFamilyUser familyUser = watchFamilyUserService.selectWatchFamilyUserByDeviceId(deviceId,null);
+                            if (familyUser == null) {
+                                WatchFamilyUser watchFamilyUser = new WatchFamilyUser();
+                                watchFamilyUser.setDeviceId(deviceId);
+                                watchFamilyUserService.insertWatchFamilyUser(watchFamilyUser);
+                            }
+                        });
+                    }
                 }
             }
 
@@ -362,7 +375,9 @@ public class WatchUserController extends AppBaseController {
         String userId = getUserId();
         String xhsDeviceId = param.get("xhsDeviceId");
         String newXhsDeviceId = param.get("newXhsDeviceId");
-        if (StringUtils.isBlank(xhsDeviceId) && StringUtils.isBlank(newXhsDeviceId)) {
+        String smartWatchDeviceId = param.get("smartWatchDeviceId");
+        if (StringUtils.isBlank(xhsDeviceId) && StringUtils.isBlank(newXhsDeviceId)
+                && StringUtils.isBlank(smartWatchDeviceId)) {
             return R.error("未获取设备!");
         }
         param.put("userId", userId);
@@ -388,15 +403,16 @@ public class WatchUserController extends AppBaseController {
     @GetMapping("/removeXHSDevice")
     public R removeXHSDevice(@RequestParam(value = "xhsDeviceId",required = false) String xhsDeviceId,
                              @RequestParam(value = "newXhsDeviceId",required = false) String newXhsDeviceId,
+                             @RequestParam(value = "smartWatchDeviceId",required = false) String smartWatchDeviceId,
                              HttpServletRequest request) {
         //1.获取当前登录用户信息
         String userId = getUserId();
-        return userService.removeXHSDevice(userId, xhsDeviceId,newXhsDeviceId);
+        return userService.removeXHSDevice(userId, xhsDeviceId, newXhsDeviceId, smartWatchDeviceId);
     }
 
     /**
      * 健康报告-个人信息
-     * param:deviceType 0腕表1小护士2新表
+     * param:deviceType 0腕表1小护士2新表3智能手表
      */
     @GetMapping("/getUserByDeviceId")
     @ApiOperation("健康报告-个人信息")