conflict

src/main/java/com/ccsens/yanyuan/api/FamilyController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @description:家属
@@ -54,4 +55,34 @@ public class FamilyController {
         log.info("申请成为家属结束{}",code);
         return JsonResponse.newInstance().ok(code);
     }
+
+    @MustLogin
+    @ApiOperation(value = "查询家属成员列表", notes = "查询家属成员列表")
+    @RequestMapping(value = "/queryList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<FamilyVo.FamilyInfo>> queryList(@ApiParam @Validated @RequestBody QueryDto<FamilyDto.QueryFamily> params) throws Exception{
+        log.info("查询家属成员列表:{}",params);
+        List<FamilyVo.FamilyInfo> familyInfoList = familyService.queryList(params.getParam(),params.getUserId());
+        log.info("查询家属成员列表结束{}",familyInfoList);
+        return JsonResponse.newInstance().ok(familyInfoList);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "查询待审核家属成员数量", notes = "查询待审核家属成员数量")
+    @RequestMapping(value = "/queryAuditNum", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<FamilyVo.NeedAuditNum> queryAuditNum(@ApiParam @Validated @RequestBody QueryDto<FamilyDto.QueryFamily> params) throws Exception{
+        log.info("查询待审核家属成员数量:{}",params);
+        FamilyVo.NeedAuditNum auditNum = familyService.queryAuditNum(params.getParam(),params.getUserId());
+        log.info("查询待审核家属成员数量结束{}",auditNum);
+        return JsonResponse.newInstance().ok(auditNum);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "审核家属成员", notes = "审核家属成员")
+    @RequestMapping(value = "/auditFamily", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse auditFamily(@ApiParam @Validated @RequestBody QueryDto<FamilyDto.AuditFamily> params) throws Exception{
+        log.info("查询待审核家属成员数量:{}",params);
+        CodeError.Code code = familyService.auditFamily(params.getParam(),params.getUserId());
+        log.info("查询待审核家属成员数量结束{}",code);
+        return JsonResponse.newInstance().ok(code);
+    }
 }

src/main/java/com/ccsens/yanyuan/api/ToolController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @author AUSU
@@ -52,4 +53,14 @@ public class ToolController {
         return JsonResponse.newInstance().ok(qrCode);
     }
 
+
+    @MustLogin
+    @ApiOperation(value = "查询工具箱列表", notes = "查询工具箱列表")
+    @RequestMapping(value = "/queryToolList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<ToolVo.ToolInfo>> queryToolList(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{
+        log.info("查询工具箱列表:{}",params);
+        List<ToolVo.ToolInfo> toolInfoList  = toolService.queryToolList(params.getUserId());
+        log.info("查询工具箱列表结束{}",toolInfoList);
+        return JsonResponse.newInstance().ok(toolInfoList);
+    }
 }

src/main/java/com/ccsens/yanyuan/api/TrainPlanController.java

@@ -1,6 +1,7 @@
 package com.ccsens.yanyuan.api;
 
 import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.util.CodeError;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.bean.dto.QueryDto;
 import com.ccsens.yanyuan.bean.dto.TrainPlanDto;
@@ -53,9 +54,17 @@ public class TrainPlanController {
     @ApiOperation(value = "选择工具", notes = "选择工具")
     @RequestMapping(value = "/chooseTool", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse chooseTool(@ApiParam @Validated @RequestBody QueryDto<TrainPlanDto.ChooseTool> params) {
-        log.info("选择工具{}",params);
+        log.info("选择工具{}", params);
         YanYuanCodeError codeError = trainPlanService.chooseTool(params.getParam(), params.getUserId());
         log.info("选择工具结束,{}", codeError);
         return JsonResponse.newInstance().ok(codeError);
     }
+    @ApiOperation(value = "修改训练结果", notes = "修改训练结果")
+    @RequestMapping(value = "/updateResult", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse updateResult(@ApiParam @Validated @RequestBody QueryDto<TrainPlanDto.TrainResult> params) {
+        log.info("修改训练结果:{}",params);
+        CodeError.Code code  = trainPlanService.updateResult(params.getParam(), params.getUserId());
+        log.info("修改训练结果结束:{}",code);
+        return JsonResponse.newInstance().ok(code);
+    }
 }

src/main/java/com/ccsens/yanyuan/api/UserPowerController.java

@@ -42,4 +42,13 @@ public class UserPowerController {
         return JsonResponse.newInstance().ok(userType);
     }
 
+    @MustLogin
+    @ApiOperation(value = "首页用户身份判断", notes = "首页用户身份判断")
+    @RequestMapping(value = "/homeIdentity", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<UserPowerVo.UserPower> findHomeIdentity(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{
+        log.info("首页用户身份判断{}",params);
+        UserPowerVo.UserPower userPower = userPowerService.findHomeIdentity(params.getUserId(),params.getPhone());
+        log.info("首页用户身份判断结束{}",userPower);
+        return JsonResponse.newInstance().ok(userPower);
+    }
 }

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

@@ -44,4 +44,22 @@ public class FamilyDto {
                     && StrUtil.isNotEmpty(educateLevel);
         }
     }
+
+    @Data
+    @ApiModel("查询家属列表-请求")
+    public static class QueryFamily {
+        @NotNull
+        @ApiModelProperty("项目id(使用者userId)")
+        private Long projectId;
+    }
+
+    @Data
+    @ApiModel("审核家属列表-请求")
+    public static class AuditFamily {
+        @NotNull
+        @ApiModelProperty("关系id")
+        private Long relationId;
+        @ApiModelProperty("审核状态(1审核通过 2审核未通过)")
+        private Byte auditStatus;
+    }
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 
 /**
  * @description:
@@ -30,4 +31,15 @@ public class TrainPlanDto {
         @ApiModelProperty("设备ID")
         private Long equipmentId;
     }
+    @Data
+    @ApiModel("修改训练结果-请求")
+    public static class TrainResult {
+        @NotNull
+        @ApiModelProperty("训练结果ID")
+        private Long resultId;
+        @ApiModelProperty("完成时间")
+        private Integer time;
+        @ApiModelProperty("完成状态")
+        private BigDecimal finishResult;
+    }
 }

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

@@ -26,4 +26,32 @@ public class FamilyVo {
         @ApiModelProperty("文化程度")
         private String educateLevel;
     }
+
+    @Data
+    @ApiModel("家属信息")
+    public static class FamilyInfo {
+        @ApiModelProperty("关系id")
+        private Long relationId;
+        @ApiModelProperty("家属ID")
+        private Long familyId;
+        @ApiModelProperty("家属姓名")
+        private String name;
+        @ApiModelProperty("家属性别 1：男 2：女")
+        private Byte sex;
+        @ApiModelProperty("家属年龄")
+        private Integer age;
+        @ApiModelProperty("家属职业")
+        private String jobTitle;
+        @ApiModelProperty("文化程度")
+        private String educateLevel;
+        @ApiModelProperty("审核状态(0未审核 1审核通过 2审核未通过)")
+        private String auditStatus;
+    }
+
+    @Data
+    @ApiModel("待审核数量")
+    public static class NeedAuditNum {
+        @ApiModelProperty("待审核数量")
+        private Integer auditNum;
+    }
 }

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

@@ -46,4 +46,19 @@ public class ToolVo {
         @ApiModelProperty("二维码路径")
         private String url;
     }
+
+    @Data
+    @ApiModel("工具箱信息-响应")
+    public static class ToolInfo {
+        @ApiModelProperty("工具箱码")
+        private String code;
+        @ApiModelProperty("wifi名称")
+        private String wifiName;
+        @ApiModelProperty("wifi状态(0未设置,1wifi未连接,2wifi已连接)")
+        private Byte wifiStatus;
+        @ApiModelProperty("电量")
+        private Integer electricQuantity;
+        @ApiModelProperty("设备状态(0开机,1休眠,2断电,3正常)")
+        private Byte equipmentStatus;
+    }
 }

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

@@ -18,4 +18,14 @@ public class UserPowerVo {
         private Byte type;
     }
 
+    @Data
+    @ApiModel("首页用户身份-返参")
+    public static class UserPower {
+        @ApiModelProperty("用户类型(0:普通用户 1:企业用户)")
+        private Byte isCompany;
+        @ApiModelProperty("是否满员 0：未满员 1:满员")
+        private Byte isMax;
+        @ApiModelProperty("老人数量")
+        private Integer personNumber;
+    }
 }

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

@@ -1,9 +1,12 @@
 package com.ccsens.yanyuan.persist.dao;
 
+import com.ccsens.yanyuan.bean.vo.FamilyVo;
 import com.ccsens.yanyuan.bean.vo.ZaritVo;
 import com.ccsens.yanyuan.persist.mapper.UserFamilyMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author whj
  */
@@ -14,4 +17,18 @@ public interface FamilyDao extends UserFamilyMapper {
      * @return 家庭成员信息
      */
     ZaritVo.ZaritInfo queryByUserId(@Param("userId") Long userId);
+
+    /**
+     * 查询家庭信息列表
+     * @param projectId 项目id(使用者userId)
+     * @return 使用者家庭信息列表
+     */
+    List<FamilyVo.FamilyInfo> queryList(@Param("projectId") Long projectId);
+
+    /**
+     * 查询待审核数量
+     * @param projectId 项目id(使用者userId)
+     * @return 待审核数量
+     */
+    FamilyVo.NeedAuditNum queryAuditNum(@Param("projectId") Long projectId);
 }

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

@@ -1,10 +1,13 @@
 package com.ccsens.yanyuan.persist.dao;
 
 import com.ccsens.yanyuan.bean.po.Tool;
+import com.ccsens.yanyuan.bean.vo.ToolVo;
 import com.ccsens.yanyuan.persist.mapper.ToolMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author AUSU
  */
@@ -17,4 +20,11 @@ public interface ToolDao extends ToolMapper {
      * @return 工具箱信息
      */
     Tool queryByCode(@Param("toolCode") String toolCode);
+
+    /**
+     * 查询用户的工具箱列表
+     * @param userId 用户id
+     * @return 工具箱列表
+     */
+    List<ToolVo.ToolInfo> queryToolList(@Param("userId") Long userId);
 }

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

@@ -1,6 +1,7 @@
 package com.ccsens.yanyuan.persist.dao;
 
 import com.ccsens.yanyuan.bean.vo.TrainContentVo;
+import com.ccsens.yanyuan.persist.mapper.TrainResultMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -8,7 +9,7 @@ import java.util.List;
 /**
  * @author whj
  */
-public interface TrainResultDao {
+public interface TrainResultDao extends TrainResultMapper {
     /**
      * 查询训练结果
      * @param recordId 训练计划ID

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

@@ -33,4 +33,11 @@ public interface UserRelationDao extends UserRelationMapper {
      * @return 0否 >1是
      */
     Integer queryUpdatePower(@Param("projectId") Long projectId,@Param("userId")  Long userId);
+
+    /**
+     * 查询关联的老人数量
+     * @param userId 用户id
+     * @return  关联的老人数量
+     */
+    Integer queryPersonNumber(@Param("userId") Long userId);
 }

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

@@ -2,6 +2,7 @@ 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.util.CodeError;
 import com.ccsens.yanyuan.bean.dto.FamilyDto;
 import com.ccsens.yanyuan.bean.po.*;
@@ -112,4 +113,35 @@ public class FamilyService implements IFamilyService {
         }
         return userFamilies.get(0);
     }
+
+    @Override
+    public List<FamilyVo.FamilyInfo> queryList(FamilyDto.QueryFamily param, Long userId) {
+        return familyDao.queryList(param.getProjectId());
+    }
+
+    @Override
+    public FamilyVo.NeedAuditNum queryAuditNum(FamilyDto.QueryFamily param, Long userId) {
+        return familyDao.queryAuditNum(param.getProjectId());
+    }
+
+    @Override
+    public CodeError.Code auditFamily(FamilyDto.AuditFamily param, Long userId) {
+        UserRelation userRelation = userRelationDao.selectByPrimaryKey(param.getRelationId());
+        if (ObjectUtil.isNull(userRelation)) {
+            return YanYuanCodeError.PARAM_ERROR;
+        }
+        UserRelationExample userRelationExample = new UserRelationExample();
+        userRelationExample.createCriteria().andAuditStatusEqualTo(param.getAuditStatus()).andIdEqualTo(param.getRelationId());
+        List<UserRelation> userRelations = userRelationDao.selectByExample(userRelationExample);
+        if (CollectionUtil.isNotEmpty(userRelations)) {
+            return YanYuanCodeError.STATUS_EXIST;
+        }
+        UserRelation updateUserRelation = new UserRelation();
+        updateUserRelation.setId(param.getRelationId());
+        updateUserRelation.setAuditStatus(param.getAuditStatus());
+        userRelationDao.updateByPrimaryKeySelective(updateUserRelation);
+        return YanYuanCodeError.SUCCESS;
+    }
+
+
 }

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

@@ -4,6 +4,8 @@ import com.ccsens.util.CodeError;
 import com.ccsens.yanyuan.bean.dto.FamilyDto;
 import com.ccsens.yanyuan.bean.vo.FamilyVo;
 
+import java.util.List;
+
 /**
  * @author whj
  */
@@ -23,4 +25,28 @@ public interface IFamilyService {
      * @return 用户信息
      */
     FamilyVo.Personal personal(Long userId);
+
+    /**
+     * 查询家属列表
+     * @param param 项目id(使用者id)
+     * @param userId 用户id
+     * @return 家属列表
+     */
+    List<FamilyVo.FamilyInfo> queryList(FamilyDto.QueryFamily param, Long userId);
+
+    /**
+     * 查询需审核数量
+     * @param param 项目id(使用者id)
+     * @param userId 用户id
+     * @return 需审核数量
+     */
+    FamilyVo.NeedAuditNum queryAuditNum(FamilyDto.QueryFamily param, Long userId);
+
+    /**
+     * 审核家属成员
+     * @param param 关系id/审核状态
+     * @param userId 用户id
+     * @return 成功/失败
+     */
+    CodeError.Code auditFamily(FamilyDto.AuditFamily param, Long userId);
 }

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

@@ -3,6 +3,8 @@ package com.ccsens.yanyuan.service;
 import com.ccsens.yanyuan.bean.dto.ToolDto;
 import com.ccsens.yanyuan.bean.vo.ToolVo;
 
+import java.util.List;
+
 public interface IToolService {
 
     /**
@@ -21,4 +23,11 @@ public interface IToolService {
      * @return 二维码路径
      */
     ToolVo.QrCode generateQrCode(ToolDto.QrCode param, Long userId) throws Exception;
+
+    /**
+     * 查询工具箱列表
+     * @param userId 当前用户id
+     * @return 工具箱列表
+     */
+    List<ToolVo.ToolInfo> queryToolList(Long userId);
 }

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

@@ -1,5 +1,6 @@
 package com.ccsens.yanyuan.service;
 
+import com.ccsens.util.CodeError;
 import com.ccsens.yanyuan.bean.dto.TrainPlanDto;
 import com.ccsens.yanyuan.bean.vo.TaskVo;
 import com.ccsens.yanyuan.util.YanYuanCodeError;
@@ -30,4 +31,13 @@ public interface ITrainPlanService {
      * @return 成功与否
      */
     YanYuanCodeError chooseTool(TrainPlanDto.ChooseTool param, Long userId);
+
+
+    /**
+     * 修改训练结果
+     * @param param 完成时间/完成状态
+     * @param userId 当前用户id
+     * @return 成功/失败
+     */
+    CodeError.Code updateResult(TrainPlanDto.TrainResult param, Long userId);
 }

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

@@ -15,4 +15,12 @@ public interface IUserPowerService {
      * @return 是否企业用户
      */
     UserPowerVo.UserType findIdentity(String phone, Long userId);
+
+    /**
+     * 首页用户身份
+     * @param userId 用户id
+     * @param phone 用户手机号
+     * @return 用户身份
+     */
+    UserPowerVo.UserPower findHomeIdentity(Long userId,String phone);
 }

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

@@ -159,4 +159,9 @@ public class ToolService implements IToolService {
         return bindTool;
     }
 
+
+    @Override
+    public List<ToolVo.ToolInfo> queryToolList(Long userId) {
+        return toolDao.queryToolList(userId);
+    }
 }

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

@@ -1,7 +1,10 @@
 package com.ccsens.yanyuan.service;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.ccsens.util.CodeError;
 import com.ccsens.yanyuan.bean.dto.TrainPlanDto;
+import com.ccsens.yanyuan.bean.po.TrainResult;
 import com.ccsens.yanyuan.bean.vo.TaskVo;
 import com.ccsens.yanyuan.bean.vo.TrainContentVo;
 import com.ccsens.yanyuan.persist.dao.*;
@@ -66,4 +69,19 @@ public class TrainPlanService implements ITrainPlanService {
     public YanYuanCodeError chooseTool(TrainPlanDto.ChooseTool param, Long userId) {
         return null;
     }
+
+    @Override
+    public CodeError.Code updateResult(TrainPlanDto.TrainResult param, Long userId) {
+        TrainResult trainResult = new TrainResult();
+        trainResult.setId(param.getResultId());
+        trainResult.setOperator(userId);
+        if (ObjectUtil.isNotNull(param.getTime())) {
+            trainResult.setFinishTime(param.getTime());
+        }
+        if (ObjectUtil.isNotNull(param.getFinishResult())) {
+            trainResult.setFinishResult(param.getFinishResult());
+        }
+        trainResultDao.updateByPrimaryKeySelective(trainResult);
+        return CodeError.SUCCESS;
+    }
 }

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

@@ -2,6 +2,7 @@ package com.ccsens.yanyuan.service;
 
 import com.ccsens.yanyuan.bean.vo.UserPowerVo;
 import com.ccsens.yanyuan.persist.dao.UserPowerDao;
+import com.ccsens.yanyuan.persist.dao.UserRelationDao;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -16,6 +17,8 @@ public class UserPowerService implements IUserPowerService{
 
     @Resource
     private UserPowerDao userPowerDao;
+    @Resource
+    private UserRelationDao userRelationDao;
 
     @Override
     public UserPowerVo.UserType findIdentity(String phone, Long userId) {
@@ -29,4 +32,23 @@ public class UserPowerService implements IUserPowerService{
         return userType;
     }
 
+    @Override
+    public UserPowerVo.UserPower findHomeIdentity(Long userId, String phone) {
+        UserPowerVo.UserPower userPower = new UserPowerVo.UserPower();
+        //企业用户or普通用户
+        Integer identity = userPowerDao.findIdentity(phone, userId);
+        if (identity < 1) {
+            userPower.setIsCompany((byte) 0);
+            //是否满员
+            Byte isMax = userRelationDao.queryIsMax(userId);
+            userPower.setIsMax(isMax);
+        }else {
+            userPower.setIsCompany((byte) 1);
+        }
+        //查询已关联老人数量
+        Integer personNumber = userRelationDao.queryPersonNumber(userId);
+        userPower.setPersonNumber(personNumber);
+        return userPower;
+    }
+
 }

src/main/java/com/ccsens/yanyuan/util/YanYuanCodeError.java

@@ -34,6 +34,7 @@ public class YanYuanCodeError extends CodeError {
     public static final Code QUESTION_IMPORT_NUM_LACK = new Code(524,"题目未填写", true);
     public static final Code QUESTION_IMPORT_SORT_LACK = new Code(525,"排序未填写", true);
     public static final Code ZARIT_UNFINISHED = new Code(526,"您还没有填写照顾者负担量表，请先回答问卷内容。", true);
+    public static final Code STATUS_EXIST = new Code(527,"操作已提交,请勿重复提交", true);
 
 
 

src/main/resources/mapper_dao/FamilyDao.xml

@@ -16,4 +16,39 @@
             rec_status = 0
         AND user_id = #{userId}
     </select>
+
+    <select id="queryList" resultType="com.ccsens.yanyuan.bean.vo.FamilyVo$FamilyInfo">
+        SELECT
+            r.id AS relationId,
+            f.id AS familyId,
+            f.`name`,
+            f.sex,
+            f.age,
+            f.job_title,
+            f.educate_level,
+            r.audit_status
+        FROM
+            u_user_relation AS r
+        LEFT JOIN u_user_family AS f ON r.user_id = f.user_id
+        WHERE
+            r.rec_status = 0
+        AND r.relation_type = 2
+        AND r.key_user_id = #{projectId}
+        AND f.rec_status = 0
+        ORDER BY
+            r.audit_status,
+            r.created_at DESC
+    </select>
+
+    <select id="queryAuditNum" resultType="com.ccsens.yanyuan.bean.vo.FamilyVo$NeedAuditNum">
+        SELECT
+            COUNT(id) AS auditNum
+        FROM
+            u_user_relation AS r
+        WHERE
+            r.rec_status = 0
+        AND r.audit_status = 0
+        AND r.relation_type = 2
+        AND key_user_id = #{projectId}
+    </select>
 </mapper>

src/main/resources/mapper_dao/ToolDao.xml

@@ -16,4 +16,20 @@
             AND `code` = #{toolCode}
     </select>
 
+    <select id="queryToolList" resultType="com.ccsens.yanyuan.bean.vo.ToolVo$ToolInfo">
+        SELECT
+            t.`code`,
+            te.wifi_name,
+            te.wifi_status,
+            te.electric_quantity,
+            te.equipment_status
+        FROM
+            t_tool AS t
+        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}
+    </select>
+
 </mapper>

src/main/resources/mapper_dao/UserRelationDao.xml

@@ -48,4 +48,15 @@
         AND key_user_id = #{projectId}
         AND user_id = #{userId}
     </select>
+
+    <select id="queryPersonNumber" resultType="java.lang.Integer">
+        SELECT
+            COUNT(id)
+        FROM
+            u_user_relation
+        WHERE
+            rec_status = 0
+        AND
+            user_id = #{userId}
+    </select>
 </mapper>