From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java
index 96ec53c..e4f8e13 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java
@@ -1,5 +1,11 @@
package com.panzhihua.grid_app.api;
+import javax.annotation.Resource;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.EditUserInfoAppDTO;
@@ -7,22 +13,21 @@
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.web.bind.annotation.*;
-
-import javax.annotation.Resource;
/**
* 我的模块
+ *
* @author lyq
*/
@Slf4j
@@ -51,14 +56,15 @@
if (R.isOk(r)) {
Object data = r.getData();
if (!ObjectUtils.isEmpty(data)) {
- LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO) data;
- //查询社区信息
+ LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO)data;
+ // 查询社区信息
if (null != communityId && 0 != communityId) {
R r1 = communityService.detailCommunity(communityId);
if (R.isOk(r1)) {
Object data1 = r1.getData();
if (!ObjectUtils.isEmpty(data1)) {
- loginUserInfoVO.setComActVO(JSONObject.parseObject(JSONObject.toJSONString(data1), ComActVO.class));
+ loginUserInfoVO
+ .setComActVO(JSONObject.parseObject(JSONObject.toJSONString(data1), ComActVO.class));
r.setData(loginUserInfoVO);
}
}
@@ -72,42 +78,56 @@
@PostMapping("/user")
public R putUser(@RequestBody EditUserInfoAppDTO userInfoAppDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if(loginUserInfo == null){
+ if (loginUserInfo == null) {
return R.fail("请先登录");
}
- if(StringUtils.isNotEmpty(userInfoAppDTO.getImagesUrl())){
+ if (StringUtils.isNotEmpty(userInfoAppDTO.getImagesUrl())) {
loginUserInfo.setImageUrl(userInfoAppDTO.getImagesUrl());
+ loginUserInfo.setNickName(null);
}
- if(StringUtils.isNotEmpty(userInfoAppDTO.getNickName())){
+ if (StringUtils.isNotEmpty(userInfoAppDTO.getNickName())) {
loginUserInfo.setNickName(userInfoAppDTO.getNickName());
+ loginUserInfo.setName(userInfoAppDTO.getNickName());
+ loginUserInfo.setImageUrl(null);
}
return userService.putUser(loginUserInfo);
}
@ApiOperation(value = "修改用户登录密码-lyq")
@PutMapping("/edit/pass")
- public R updatePass(@RequestBody EditUserInfoPassAppDTO userInfoAppDTO){
+ public R updatePass(@RequestBody EditUserInfoPassAppDTO userInfoAppDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if(loginUserInfo == null){
+ if (loginUserInfo == null) {
return R.fail("请先登录");
}
userInfoAppDTO.setUserId(loginUserInfo.getUserId());
R updateUser = userService.updateUserPassByApp(userInfoAppDTO);
- if(R.isOk(updateUser)){
+ if (R.isOk(updateUser)) {
String token = this.getToken();
- if(StringUtils.isNotEmpty(token)){
+ if (StringUtils.isNotEmpty(token)) {
tokenService.logout(token);
}
return R.ok();
- }else{
+ } else {
return updateUser;
}
}
@ApiOperation(value = "根据版本号获取最新版本信息-lyq")
@GetMapping("/edition")
- public R editionUpdate(){
+ public R editionUpdate() {
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);
+ }
+
}
--
Gitblit v1.7.1