二期 管家小程序 bug

src/main/java/com/care/keeper/controller/KeeperMemberApiController.java

@@ -3,6 +3,7 @@ package com.care.keeper.controller;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.care.client.vo.MemberInfoVO;
 import com.care.common.entity.*;
 import com.care.common.service.*;
 import com.care.common.util.Result;
@@ -13,10 +14,7 @@ import com.care.keeper.vo.KeeperInfoVO;
 import com.care.keeper.vo.OlderVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -72,6 +70,26 @@ public class KeeperMemberApiController {
         return Result.success(current);
     }
 
+    @PostMapping("/update/updateMyInfo")
+    @ApiOperation(value = "修改个人信息（电话、姓名、头像、性别等） -- 二期新增", notes = "修改个人信息（电话、姓名、头像、性别等）")
+    public Result<Object> updateMyInfo(@RequestHeader("token") String token,
+                                             @RequestBody KeeperInfoVO vo){
+        try {
+            KeeperInfoVO current = keeperPassportService.checkToken(token);
+            CareSysUser member = careSysUserService.detailByPhone4Keeper(current.getPhone());
+            vo.setId(member.getId());
+            if(this.keeperInfoApiService.updateMyInfo(vo)){
+                return  Result.success("修改成功！");
+            } else {
+                return Result.error("修改失败！");
+            }
+
+        } catch (Exception e) {
+            return Result.error("修改失败！");
+        }
+
+    }
+
     @ApiOperation(value = "刷新基本信息", notes = "刷新用户基本录信息")
     @PostMapping("refresh")
     public Result<Object> refreshMember(@RequestHeader String token) {

src/main/java/com/care/keeper/service/KeeperInfoApiService.java

@@ -5,18 +5,22 @@ import cn.hutool.core.collection.CollUtil;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
+
 import com.care.common.entity.*;
 
 import com.care.common.service.*;
 
+import com.care.keeper.vo.KeeperInfoVO;
 import com.care.keeper.vo.OlderVO;
 
 import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -35,6 +39,8 @@ public class KeeperInfoApiService {
     private CareOlderService careOlderService;
     @Resource
     private CareEventOrderChambService careEventOrderChambService;
+    @Resource
+    private CareSysUserService careSysUserService;
 
     public Integer getServeCount(Long chambId){
         QueryWrapper<CareEventOrderChamb> queryWrapper = new QueryWrapper<>();
@@ -64,4 +70,18 @@ public class KeeperInfoApiService {
         }
         return olderVOList;
     }
+
+    /**
+     * 修改个人信息
+     * @param vo
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateMyInfo(KeeperInfoVO vo){
+        CareSysUser careSysUser = this.careSysUserService.getById(vo.getId());
+        BeanUtil.copyProperties(vo,careSysUser);
+        careSysUser.setModifyTime(new Date());
+        return this.careSysUserService.updateById(careSysUser);
+    }
+
+
 }

src/main/java/com/care/keeper/vo/KeeperInfoVO.java

@@ -48,7 +48,7 @@ public class KeeperInfoVO implements Serializable {
     private String phone;
 
 
-    @ApiModelProperty("姓名：M：男 W：女")
+    @ApiModelProperty("性别：M：男 W：女")
     private String gender;
 
 

src/main/resources/common.properties

@@ -16,7 +16,7 @@ mqtt.password=public
 #是否开启mqtt消息接受服务，开启：1，不开启：0
 mqtt.on=1
 #设备激活返回消息超时(秒)
-mqtt.dev.jihuo.timeout=15
+mqtt.dev.jihuo.timeout=10
 
 #设备工作时接受消息的mqtt topic
 mqtt.topic.work.template=5JPD/monitor/XXXXX/event