huanghongfa
2021-06-22 3875a8f62bd6cecd78f56fb9a6911fa44891dfed
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java
@@ -7,16 +7,19 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.GridMemberPositionDTO;
import com.panzhihua.common.service.auth.TokenService;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.grid.GridService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -77,9 +80,11 @@
        }
        if(StringUtils.isNotEmpty(userInfoAppDTO.getImagesUrl())){
            loginUserInfo.setImageUrl(userInfoAppDTO.getImagesUrl());
            loginUserInfo.setNickName(null);
        }
        if(StringUtils.isNotEmpty(userInfoAppDTO.getNickName())){
            loginUserInfo.setNickName(userInfoAppDTO.getNickName());
            loginUserInfo.setImageUrl(null);
        }
        return userService.putUser(loginUserInfo);
    }
@@ -110,4 +115,15 @@
        return gridService.editionUpdate();
    }
    @ApiOperation(value = "网格员定时上报地理位置-lyq")
    @PostMapping("/report")
    public R gridReportPosition(@RequestBody @Validated(AddGroup.class)GridMemberPositionDTO memberPositionDTO){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if(loginUserInfo == null){
            return R.fail("请先登录");
        }
        memberPositionDTO.setGridMemberId(loginUserInfo.getUserId());
        return gridService.gridReportPosition(memberPositionDTO);
    }
}