From 80d2948aae6140db6cb7fde97d3ef8cc859144ab Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 23 十一月 2023 14:36:56 +0800
Subject: [PATCH] 行政区划编码最大值改为999，农户编码改为字符串型
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java | 70 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 18 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
index 9368a24..cf8637e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
@@ -23,10 +23,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Objects;
@@ -58,9 +55,9 @@
schema = @Schema(implementation = BaUser.class))}
)
})
- @PostMapping(path = "some")
+ @PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop("-1")
- public BaseResponse<QueryResultVo<List<BaUser>>> some(QueryVo vo){
+ public BaseResponse<QueryResultVo<List<BaUser>>> some(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) @Valid QueryVo vo){
try {
QueryResultVo<List<BaUser>> res = this.sv.selectSome(vo) ;
return BaseResponseUtils.buildSuccess(res);
@@ -83,10 +80,10 @@
schema = @Schema(implementation = BaUser.class))}
)
})
- @GetMapping(path = "one")
+ @GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
@SsoAop("-1")
- public BaseResponse<BaUser> one(@Parameter(description = "瀹炰綋id", required = true) Long id){
- return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
+ public BaseResponse<BaUser> one(@Parameter(description = "瀹炰綋id", required = true) String id){
+ return BaseResponseUtils.buildSuccess(this.sv.selectById(Long.parseLong(id)));
}
/**
@@ -103,9 +100,9 @@
schema = @Schema(implementation = Boolean.class))}
)
})
- @PostMapping(path = "save", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ @PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> save(@Parameter(description = "form琛ㄥ崟鏁版嵁", required = true) @Valid BaUser po, @Parameter(hidden = true) BindingResult bindingResult){
+ public BaseResponse<Boolean> save(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaUser po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -148,9 +145,9 @@
schema = @Schema(implementation = Boolean.class))}
)
})
- @PostMapping(path = "update", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ @PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> update(@Parameter(description = "form琛ㄥ崟鏁版嵁", required = true) @Valid BaUser po, @Parameter(hidden = true) BindingResult bindingResult){
+ public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaUser po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -190,7 +187,7 @@
})
@GetMapping(path = "changePassword", consumes = MediaType.TEXT_PLAIN_VALUE)
@SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> changePassword(@Parameter(description = "瀹炰綋id", required = true) Long id,
+ public BaseResponse<Boolean> changePassword(@Parameter(description = "瀹炰綋id", required = true) String id,
@Parameter(description = "鏃у瘑鐮�", required = true) String oldPassword,
@Parameter(description = "鏂板瘑鐮�", required = true) String newPassword) throws Exception{
if(id == null){
@@ -210,16 +207,17 @@
oldPassword = MD5.encrypt(oldPassword) ;//杩涜鍔犲瘑鐮�
newPassword = MD5.encrypt(newPassword) ;//杩涜鍔犲瘑鐮�
+ Long idLg = Long.parseLong(id) ;
int count ;
try {
- BaUser po = this.sv.selectById(id);
+ BaUser po = this.sv.selectById(idLg);
if(Objects.isNull(po)){
return BaseResponseUtils.buildFail("鏈緱鍒扮敤鎴凤紝璇锋眰澶辫触") ;
}else{
if(!po.password.equalsIgnoreCase(oldPassword)){
return BaseResponseUtils.buildFail("鏃у瘑鐮佷笉姝ｇ‘锛岃姹傚け璐�") ;
}else{
- count = this.sv.changePassword(id, newPassword) ;
+ count = this.sv.changePassword(idLg, newPassword) ;
}
}
} catch (Exception e) {
@@ -231,6 +229,42 @@
}else{
return BaseResponseUtils.buildSuccess(true) ;
}
+ }
+
+
+ /**
+ * 璁剧疆鐢ㄦ埛瑙掕壊
+ * @param id 鐢ㄦ埛ID
+ * @return 鏄惁鎴愬姛
+ */
+ @Operation(summary = "璁剧疆鐢ㄦ埛瑙掕壊", description = "鎻愪氦鐢ㄦ埛ID锛屽強鎵�閫夋嫨鐨勮鑹睮D闆嗗悎锛堟暟缁勶級")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = Boolean.class))}
+ )
+ })
+ @GetMapping(path = "setRoles", consumes = MediaType.TEXT_PLAIN_VALUE)
+ @SsoAop("-1")//@SsoAop(power = "-1")
+ public BaseResponse<Boolean> setRoles(@Parameter(description = "瀹炰綋id", required = true) String id,
+ @Parameter(description = "瑙掕壊id鏁扮粍") String[] roleIds){
+ Long[] roleId_lg = null ;
+ if(roleIds != null && roleIds.length > 0){
+ roleId_lg = new Long[roleIds.length] ;
+ int index = 0 ;
+ for(String roleId : roleIds){
+ roleId_lg[index++] = Long.parseLong(roleId) ;
+ }
+ }
+ try {
+ this.sv.setRoles(Long.parseLong(id), roleId_lg);
+ } catch (Exception e) {
+ log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ return BaseResponseUtils.buildSuccess(true) ;
}
@@ -250,13 +284,13 @@
})
@GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
@SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> delete(@Parameter(description = "瀹炰綋id", required = true) Long id){
+ public BaseResponse<Boolean> delete(@Parameter(description = "瀹炰綋id", required = true) String id){
if(id == null){
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
}
int count;
try {
- count = this.sv.delete(id);
+ count = this.sv.delete(Long.parseLong(id));
} catch (Exception e) {
log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
--
Gitblit v1.8.0