修改接口

src/main/java/com/ccsens/yanyuan/bean/dto/FamilyDto.java

@@ -61,5 +61,8 @@ public class FamilyDto {
         private Long relationId;
         @ApiModelProperty("审核状态(1审核通过 2审核未通过)")
         private Byte auditStatus;
+        @NotNull
+        @ApiModelProperty("项目id")
+        private Long projectId;
     }
 }

src/main/java/com/ccsens/yanyuan/bean/vo/ToolVo.java

@@ -50,6 +50,10 @@ public class ToolVo {
     @Data
     @ApiModel("工具箱信息-响应")
     public static class ToolInfo {
+        @ApiModelProperty("工具箱id")
+        private Long toolId;
+        @ApiModelProperty("设备id")
+        private Long equipmentId;
         @ApiModelProperty("工具箱码")
         private String code;
         @ApiModelProperty("wifi名称")

src/main/java/com/ccsens/yanyuan/persist/dao/TraineeDao.java

@@ -1,5 +1,6 @@
 package com.ccsens.yanyuan.persist.dao;
 
+import com.ccsens.yanyuan.bean.po.User;
 import com.ccsens.yanyuan.bean.vo.TraineeVo;
 import com.ccsens.yanyuan.persist.mapper.UserMapper;
 import org.apache.ibatis.annotations.Param;
@@ -34,4 +35,11 @@ public interface TraineeDao extends UserMapper {
      * @param userId 升级的用户
      */
     void upgrade(@Param("keyUserIds")List<Long> keyUserIds, @Param("userId") Long userId);
+
+    /**
+     * 根据keyId查询使用者信息
+     * @param projectId 项目id(使用者keyId)
+     * @return 使用者信息
+     */
+    User queryByKeyId(@Param("userId") Long projectId);
 }

src/main/java/com/ccsens/yanyuan/service/FamilyService.java

@@ -3,11 +3,15 @@ package com.ccsens.yanyuan.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
+import com.ccsens.cloudutil.bean.tall.dto.ProjectDto;
+import com.ccsens.cloudutil.feign.Tall3FeignClient;
 import com.ccsens.util.CodeError;
+import com.ccsens.util.JsonResponse;
 import com.ccsens.yanyuan.bean.dto.FamilyDto;
 import com.ccsens.yanyuan.bean.po.*;
 import com.ccsens.yanyuan.bean.vo.FamilyVo;
 import com.ccsens.yanyuan.persist.dao.FamilyDao;
+import com.ccsens.yanyuan.persist.dao.TraineeDao;
 import com.ccsens.yanyuan.persist.dao.UserRelationDao;
 import com.ccsens.yanyuan.persist.mapper.UserMapper;
 import com.ccsens.yanyuan.util.YanYuanCodeError;
@@ -38,6 +42,10 @@ public class FamilyService implements IFamilyService {
     private UserMapper userMapper;
     @Resource
     private UserRelationDao userRelationDao;
+    @Resource
+    private Tall3FeignClient tall3FeignClient;
+    @Resource
+    private TraineeDao traineeDao;
 
     @Override
     public CodeError.Code apply(FamilyDto.Apply param, Long userId) {
@@ -140,6 +148,14 @@ public class FamilyService implements IFamilyService {
         updateUserRelation.setId(param.getRelationId());
         updateUserRelation.setAuditStatus(param.getAuditStatus());
         userRelationDao.updateByPrimaryKeySelective(updateUserRelation);
+        //关联家属与患者项目
+        if (YanYuanConstant.Audit.SUCCESS == param.getAuditStatus()) {
+            //查询使用者信息
+            User user = traineeDao.queryByKeyId(param.getProjectId());
+            ProjectDto.SaveProjectDto userProject = YanYuanConstant.Project.getUserProject(user.getKeyId(),userId,user.getUserName(),user.getCreatedAt());
+            JsonResponse response = tall3FeignClient.saveProjectList(userProject);
+            log.info("添加用户项目：{},结果：{}", userProject, response);
+        }
         return YanYuanCodeError.SUCCESS;
     }
 

src/main/resources/mapper_dao/ToolDao.xml

@@ -22,14 +22,15 @@
             te.wifi_name,
             te.wifi_status,
             te.electric_quantity,
-            te.equipment_status
+            te.equipment_status,
+            t.id AS toolId,
+            te.id AS equipmentId
         FROM
-            t_tool AS t
+            u_user_scan_tool AS ust
+        LEFT JOIN t_tool AS t ON ust.tool_id = t.id
         LEFT JOIN t_tool_equipment AS te ON t.id = te.tool_id
-        WHERE
-            t.rec_status = 0
-        AND te.rec_status = 0
-        AND t.user_id = #{userId}
+        WHERE ust.rec_status = 0 AND t.rec_status = 0 AND te.rec_status = 0
+        AND ust.user_id = #{userId}
     </select>
 
 </mapper>

src/main/resources/mapper_dao/TraineeDao.xml

@@ -49,4 +49,16 @@
             AND u.rec_status = 0
             AND r.id IS NULL
     </select>
+    <select id="queryByKeyId" resultType="com.ccsens.yanyuan.bean.po.User">
+        SELECT
+            key_id,
+            user_name,
+            created_at
+        FROM
+            u_user
+        WHERE
+            rec_status = 0
+        AND `status` = 1
+        AND key_id = #{userId}
+    </select>
 </mapper>