Skip to content

C
chnmuseum-party
Commit ececd1d3 authored by liqin's avatar liqin 💬
Browse files
Options

bug fixed

parent 520ff6e5
Show whitespace changes
Inline Side-by-side
Showing with 131 additions and 87 deletions
src/main/java/cn/wisenergy/chnmuseum/party/common/enums/AuditOperationEnum.java
View file @ ececd1d3
......@@ -9,7 +9,7 @@ public enum AuditOperationEnum {
EDIT(2, "修改"),
REMOVE(3, "下架"),
DISABLE(4, "禁用"),
UNABLE(5, "启用");
ENABLE(5, "启用");
// 错误编码
private Integer code;
......
src/main/java/cn/wisenergy/chnmuseum/party/common/log/OperType.java
View file @ ececd1d3
......@@ -10,7 +10,7 @@ public enum OperType {
ADD(2,"新增"),
UPDATE(3,"修改"),
DELETE(4,"删除"),
UNABLE(5,"启用"),
ENABLE(5,"启用"),
DISABLE(6,"禁用"),
IMPORT(7,"导入"),
LOGIN(8,"登录");
......
src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java
View file @ ececd1d3
......@@ -89,7 +89,7 @@ public class TUser implements Serializable {
@TableField("exired_date")
private LocalDate exiredDate;
@ApiModelProperty(value = "状态", allowableValues = "启用 UNABLE, 禁用DISABLE")
@ApiModelProperty(value = "状态", allowableValues = "启用 ENABLE, 禁用DISABLE")
@TableField("status")
private String status;
......
src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TUserServiceImpl.java
View file @ ececd1d3
......@@ -46,7 +46,7 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
List<TUser> list = tUserMapper.getList(page,user);
for (TUser u : list) {
if (AuditStatusEnum.REFUSED.name().equals(u.getAuditStatus())||AuditStatusEnum.APPROVED_FINAL.name().equals(u.getAuditStatus())){
if (AuditOperationEnum.UNABLE.name().equals(u.getStatus())){
if (AuditOperationEnum.ENABLE.name().equals(u.getStatus())){
u.setStatusName("活跃");
}else {
u.setStatusName("禁用");
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/BankBranchInfoController.java
View file @ ececd1d3
......@@ -215,9 +215,9 @@ public class BankBranchInfoController extends BaseController {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
// 201
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "添加成功");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) {
logger.error("添加错误!", e);
}
......@@ -253,7 +253,7 @@ public class BankBranchInfoController extends BaseController {
resultMap.put("message", "修改失败");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
} else {
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "修改成功");
return ResponseEntity.ok(resultMap);
}
......@@ -343,9 +343,9 @@ public class BankBranchInfoController extends BaseController {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
// 201
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "删除成功！");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) {
logger.error("服务器错误!", e);
}
......@@ -387,7 +387,7 @@ public class BankBranchInfoController extends BaseController {
}
map.put("status", "201");
map.put("message", "删除成功");
return ResponseEntity.status(HttpStatus.CREATED).body(map);
return ResponseEntity.status(HttpStatus.OK).body(map);
} catch (Exception e) {
logger.error("服务器错误!", e);
}
......@@ -454,7 +454,7 @@ public class BankBranchInfoController extends BaseController {
resultMap.put("message", "上传失败");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
} else {
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "上传成功");
return ResponseEntity.ok(resultMap);
}
......@@ -486,7 +486,7 @@ public class BankBranchInfoController extends BaseController {
resultMap.put("message", "删除底图失败");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
} else {
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "删除底图成功");
return ResponseEntity.ok(resultMap);
}
......@@ -514,7 +514,7 @@ public class BankBranchInfoController extends BaseController {
resultMap.put("message", "提交失败");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
} else {
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "提交成功");
return ResponseEntity.ok(resultMap);
}
......@@ -561,7 +561,7 @@ public class BankBranchInfoController extends BaseController {
} else {
map.put("status", "201");
map.put("message", "审核通过成功");
return ResponseEntity.status(HttpStatus.CREATED).body(map);
return ResponseEntity.status(HttpStatus.OK).body(map);
}
} catch (Exception e) {
logger.error("审核通过失败!", e);
......@@ -616,7 +616,7 @@ public class BankBranchInfoController extends BaseController {
} else {
map.put("status", "201");
map.put("message", "审核驳回成功");
return ResponseEntity.status(HttpStatus.CREATED).body(map);
return ResponseEntity.status(HttpStatus.OK).body(map);
}
} catch (Exception e) {
logger.error("审核驳回失败!", e);
......@@ -650,7 +650,7 @@ public class BankBranchInfoController extends BaseController {
}
map.put("status", "201");
map.put("message", "申请下线成功");
return ResponseEntity.status(HttpStatus.CREATED).body(map);
return ResponseEntity.status(HttpStatus.OK).body(map);
} catch (Exception e) {
logger.error("申请下线出错!", e);
}
......@@ -684,7 +684,7 @@ public class BankBranchInfoController extends BaseController {
}
map.put("status", "201");
map.put("message", "申请上线成功");
return ResponseEntity.status(HttpStatus.CREATED).body(map);
return ResponseEntity.status(HttpStatus.OK).body(map);
} catch (Exception e) {
logger.error("申请上线出错!", e);
}
......@@ -734,7 +734,7 @@ public class BankBranchInfoController extends BaseController {
} else {
map.put("status", "201");
map.put("message", "排序成功");
return ResponseEntity.status(HttpStatus.CREATED).body(map);
return ResponseEntity.status(HttpStatus.OK).body(map);
}
} catch (Exception e) {
logger.error("排序失败!", e);
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/DemandInfoController.java
View file @ ececd1d3
......@@ -191,9 +191,9 @@ public class DemandInfoController extends BaseController {
logger.info(zhCnt);
}
// 201
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "提交成功");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) {
logger.error("提交错误!", e);
}
......@@ -244,7 +244,7 @@ public class DemandInfoController extends BaseController {
resultMap.put("message", "反馈失败");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
} else {
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "反馈成功");
return ResponseEntity.ok(resultMap);
}
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/EmployeeController.java
View file @ ececd1d3
......@@ -227,10 +227,10 @@ public class EmployeeController extends BaseController {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
.body(resultMap);
}
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "添加成功");
// 201
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) {
resultMap.put("status", 500);
resultMap.put("message", "服务器忙");
......@@ -296,9 +296,9 @@ public class EmployeeController extends BaseController {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
// 204
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "更新成功");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) {
logger.error("更新错误!", e);
}
......@@ -339,9 +339,9 @@ public class EmployeeController extends BaseController {
resultMap.put("message", "删除失败");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "删除成功");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) {
logger.error("删除用户出错!", e);
}
......@@ -395,13 +395,13 @@ public class EmployeeController extends BaseController {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
resultMap.put("status", 201);
resultMap.put("status", 200);
String message = "删除成功";
if (!"".equals(empId) && flag) {
message = "admin不能被删除，其他选中用户删除成功";
}
resultMap.put("message", message);
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) {
logger.error("删除失败!", e);
}
......@@ -437,9 +437,9 @@ public class EmployeeController extends BaseController {
resultMap.put("message", "禁用失败");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "禁用成功");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) {
logger.error("禁用用户出错!", e);
}
......@@ -485,9 +485,9 @@ public class EmployeeController extends BaseController {
resultMap.put("message", "禁用失败");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "禁用成功");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) {
logger.error("用户禁用失败!", e);
}
......@@ -522,7 +522,7 @@ public class EmployeeController extends BaseController {
}
map.put("status", "201");
map.put("message", "启用成功");
return ResponseEntity.status(HttpStatus.CREATED).body(map);
return ResponseEntity.status(HttpStatus.OK).body(map);
} catch (Exception e) {
logger.error("用户启用出错!", e);
}
......@@ -562,7 +562,7 @@ public class EmployeeController extends BaseController {
} else {
map.put("status", "201");
map.put("message", "批量启动成功");
return ResponseEntity.status(HttpStatus.CREATED).body(map);
return ResponseEntity.status(HttpStatus.OK).body(map);
}
} catch (Exception e) {
logger.error("批量启动失败!", e);
......@@ -636,7 +636,7 @@ public class EmployeeController extends BaseController {
map.put("status", "201");
map.put("message", "重置密码成功");
map.put("password", newPassword);
return ResponseEntity.status(HttpStatus.CREATED).body(map);
return ResponseEntity.status(HttpStatus.OK).body(map);
} catch (Exception e) {
logger.error("重置密码出错!", e);
}
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java
View file @ ececd1d3
......@@ -344,11 +344,13 @@ public class ExhibitionBoardController extends BaseController {
}
final String guideAudioUrl = exhibitionBoard.getGuideAudioUrl();
final List<AudioVo> audioVoList = JSONObject.parseObject(guideAudioUrl, new TypeReference<List<AudioVo>>() {}, Feature.OrderedField);
final List<AudioVo> audioVoList = JSONObject.parseObject(guideAudioUrl, new TypeReference<List<AudioVo>>() {
}, Feature.OrderedField);
exhibitionBoard.setAudioUrlList(audioVoList.stream().map(AudioVo::getFileUrl).collect(Collectors.toList()));
final String refMaterialUrl = exhibitionBoard.getRefMaterialUrl();
final List<DatumVo> datumVoList = JSONObject.parseObject(refMaterialUrl, new TypeReference<List<DatumVo>>() {}, Feature.OrderedField);
final List<DatumVo> datumVoList = JSONObject.parseObject(refMaterialUrl, new TypeReference<List<DatumVo>>() {
}, Feature.OrderedField);
exhibitionBoard.setMaterialUrlList(datumVoList.stream().map(DatumVo::getFileUrl).collect(Collectors.toList()));
String assetId = exhibitionBoard.getAssetId();
......@@ -368,5 +370,28 @@ public class ExhibitionBoardController extends BaseController {
return getResult(exhibitionBoard);
}
@ApiOperation(value = "上架/下架展板内容", notes = "上架/下架展板内容")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path"),
@ApiImplicitParam(name = "isPublish", value = "是否上架", dataType = "Boolean", paramType = "query")
})
@PutMapping("/publish/{id}")
@RequiresPermissions("exhibition:board:publish")
public Map<String, Object> enableExhibitionBoard(@PathVariable("id") String id, @RequestParam("isPublish") Boolean isPublish) {
final Audit audit = Audit.builder().content("")
.isDeleted(false)
.refItemId(id)
.status(AuditStatusEnum.TBC.name())
.level(AuditStatusEnum.TBC.name())
.type(AuditTypeEnum.EXHIBITION_BOARD.name()).build();
if (isPublish) {
audit.setStatus(AuditOperationEnum.ENABLE.name());
} else {
audit.setStatus(AuditOperationEnum.DISABLE.name());
}
this.auditService.save(audit);
return getSuccessResult();
}
}
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/FileUploadController.java
View file @ ececd1d3
......@@ -8,6 +8,7 @@ import cn.wisenergy.chnmuseum.party.common.enums.RESPONSE_CODE_ENUM;
import cn.wisenergy.chnmuseum.party.common.mvc.InterfaceException;
import cn.wisenergy.chnmuseum.party.common.vo.BatchUploadResVO;
import cn.wisenergy.chnmuseum.party.common.vo.ImageUploadResult;
import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
......@@ -17,15 +18,11 @@ import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.*;
/**
* <p>
......@@ -39,7 +36,7 @@ import java.util.Objects;
@RestController
@RequestMapping("/file")
@Api(tags = {"文件上传接口"})
public class FileUploadController {
public class FileUploadController extends BaseController {
private static final String[] IMAGE_TYPE = new String[]{"JPG", "JPEG", "PNG", "BMP", "WBMP"};
private static final String[] AUDIO_TYPE = new String[]{"MP3", "AAC", "WMA", "FLAC", "RM", "OGG"};
......@@ -94,7 +91,7 @@ public class FileUploadController {
// // 不合法，将磁盘上的文件删除
// FastDFSUtils.deletePic(picUrl);
// }
// return ResponseEntity.status(HttpStatus.CREATED).body(fileUploadResult);
// return ResponseEntity.status(HttpStatus.OK).body(fileUploadResult);
// }
@ApiImplicitParams({
......@@ -102,7 +99,7 @@ public class FileUploadController {
})
@PostMapping(value = "/datum/upload", headers = "content-type=multipart/form-data", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@ApiOperation(value = "资料上传", notes = "资料上传")
public ResponseEntity<BatchUploadResVO> uploadFile(@RequestPart(value = "file", required = false) MultipartFile[] files) throws IOException {
public Map<String, Object> uploadFile(@RequestPart(value = "file", required = false) MultipartFile[] files) throws IOException {
if (files.length == 0) {
throw new InterfaceException(RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode(), "没有文件可供上传");
}
......@@ -157,13 +154,13 @@ public class FileUploadController {
batchUploadResVO.setTotal(files.length);
batchUploadResVO.setHandleList(handleList);
batchUploadResVO.setUrlList(datumUrlList);
return ResponseEntity.ok(batchUploadResVO);
return getResult(batchUploadResVO);
}
@PostMapping(value = "/image/upload", headers = "content-type=multipart/form-data", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@RequiresPermissions("image:upload")
@ApiOperation(value = "单图片上传", notes = "单图片上传")
public ResponseEntity<ImageUploadResult> uploadImage(@RequestParam(value = "file") MultipartFile uploadFile) throws Exception {
public Map<String, Object> uploadImage(@RequestParam(value = "file") MultipartFile uploadFile) throws Exception {
if (uploadFile == null || uploadFile.getSize() == 0) {
throw new InterfaceException(RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode(), "没有文件可供上传");
}
......@@ -183,14 +180,13 @@ public class FileUploadController {
imageUploadResult.setFileExtName(extension);
imageUploadResult.setFileSize(uploadFile.getSize());
imageUploadResult.setUrl(url);
return ResponseEntity.ok(imageUploadResult);
return getResult(imageUploadResult);
}
@PostMapping(value = "/upload/allType", headers = "content-type=multipart/form-data", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@RequiresPermissions("file:upload:allType")
@ApiOperation(value = "单文件上传（不限格式）", notes = "单文件上传（不限格式）")
public ResponseEntity<ImageUploadResult> uploadAllType(@RequestParam(value = "file") MultipartFile uploadFile) throws Exception {
public Map<String, Object> uploadAllType(@RequestParam(value = "file") MultipartFile uploadFile) throws Exception {
if (uploadFile == null || uploadFile.getSize() == 0) {
throw new InterfaceException(RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode(), "没有文件可供上传");
}
......@@ -210,7 +206,7 @@ public class FileUploadController {
imageUploadResult.setFileExtName(extension);
imageUploadResult.setFileSize(uploadFile.getSize());
imageUploadResult.setUrl(url);
return ResponseEntity.ok(imageUploadResult);
return getResult(imageUploadResult);
}
@ApiImplicitParams({
......@@ -219,7 +215,7 @@ public class FileUploadController {
@PostMapping(value = "/audio/upload", headers = "content-type=multipart/form-data", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@RequiresPermissions("audio:upload")
@ApiOperation(value = "多音频上传", notes = "多音频上传")
public ResponseEntity<BatchUploadResVO> uploadAudio(@RequestPart(value = "file", required = false) MultipartFile[] files) throws IOException {
public Map<String, Object> uploadAudio(@RequestPart(value = "file", required = false) MultipartFile[] files) throws IOException {
if (files == null || files.length == 0) {
throw new InterfaceException(RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode(), "没有文件可供上传");
}
......@@ -273,7 +269,7 @@ public class FileUploadController {
batchUploadResVO.setTotal(files.length);
batchUploadResVO.setHandleList(handleList);
batchUploadResVO.setUrlList(videoUrlList);
return ResponseEntity.ok(batchUploadResVO);
return getResult(batchUploadResVO);
}
@ApiImplicitParams({
......@@ -282,7 +278,7 @@ public class FileUploadController {
@PostMapping(value = "/video/upload", headers = "content-type=multipart/form-data", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@RequiresPermissions("video:upload")
@ApiOperation(value = "多视频上传", notes = "多视频上传")
public ResponseEntity<BatchUploadResVO> uploadVideo(@RequestPart(value = "file", required = true) MultipartFile[] files) throws IOException {
public Map<String, Object> uploadVideo(@RequestPart(value = "file", required = true) MultipartFile[] files) throws IOException {
if (files == null || files.length == 0) {
throw new InterfaceException(RESPONSE_CODE_ENUM.SERVER_ERROR.getResultCode(), "没有文件可供上传");
}
......@@ -336,7 +332,7 @@ public class FileUploadController {
batchUploadResVO.setTotal(files.length);
batchUploadResVO.setHandleList(handleList);
batchUploadResVO.setUrlList(videoUrlList);
return ResponseEntity.ok(batchUploadResVO);
return getResult(batchUploadResVO);
}
}
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LearningContentController.java
View file @ ececd1d3
......@@ -453,5 +453,28 @@ public class LearningContentController extends BaseController {
return getFailResult();
}
@ApiOperation(value = "启用/禁用学习内容", notes = "启用/禁用学习内容")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path"),
@ApiImplicitParam(name = "isPublish", value = "是否上架", dataType = "Boolean", paramType = "query")
})
@PutMapping("/enable/{id}")
@RequiresPermissions("learning:content:enable")
public Map<String, Object> enableLearningContent(@PathVariable("id") String id, @RequestParam("isPublish") Boolean isPublish) {
final Audit audit = Audit.builder().content("")
.isDeleted(false)
.refItemId(id)
.status(AuditStatusEnum.TBC.name())
.level(AuditStatusEnum.TBC.name())
.type(AuditTypeEnum.LEARNING_CONTENT.name()).build();
if (isPublish) {
audit.setStatus(AuditOperationEnum.ENABLE.name());
} else {
audit.setStatus(AuditOperationEnum.DISABLE.name());
}
this.auditService.save(audit);
return getSuccessResult();
}
}
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/PermissionController.java
View file @ ececd1d3
......@@ -132,9 +132,9 @@ public class PermissionController extends BaseController {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
// 204
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "添加成功！");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) {
logger.error("添加权限错误!", e);
}
......@@ -181,9 +181,9 @@ public class PermissionController extends BaseController {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
// 204
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "更新成功！");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) {
logger.error("编辑角色错误!", e);
}
......@@ -223,9 +223,9 @@ public class PermissionController extends BaseController {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
// 204
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "删除成功！");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) {
logger.error("删除权限错误!", e);
}
......@@ -266,9 +266,9 @@ public class PermissionController extends BaseController {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
// 204
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "删除成功！");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) {
logger.error("删除角色错误!", e);
}
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/RoleController.java
View file @ ececd1d3
......@@ -162,9 +162,9 @@ public class RoleController extends BaseController {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
}
// 204
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "添加成功");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) {
logger.error("添加角色错误!", e);
}
......@@ -251,9 +251,9 @@ public class RoleController extends BaseController {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
// 204
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "删除成功！");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) {
LOGGER.error("删除角色错误!", e);
......@@ -345,7 +345,7 @@ public class RoleController extends BaseController {
} else {
resultMap.put("status", 400);
resultMap.put("message", "错误请求！");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
}
if (!ret) {
// 更新失败, 500
......@@ -354,9 +354,9 @@ public class RoleController extends BaseController {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
}
// 204
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "更新成功！");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} else {
resultMap.put("status", 400);
resultMap.put("message", "请选择角色！");
......@@ -416,9 +416,9 @@ public class RoleController extends BaseController {
}
}
// 204
resultMap.put("status", 201);
resultMap.put("status", 200);
resultMap.put("message", "更新成功！");
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} else {
resultMap.put("status", 400);
resultMap.put("message", "请选择角色！");
......@@ -450,7 +450,7 @@ public class RoleController extends BaseController {
}
map.put("status", "201");
map.put("message", "启用成功");
return ResponseEntity.status(HttpStatus.CREATED).body(map);
return ResponseEntity.status(HttpStatus.OK).body(map);
} catch (Exception e) {
logger.error("用户启动出错!", e);
}
......@@ -491,7 +491,7 @@ public class RoleController extends BaseController {
} else {
map.put("status", "201");
map.put("message", "批量启动成功");
return ResponseEntity.status(HttpStatus.CREATED).body(map);
return ResponseEntity.status(HttpStatus.OK).body(map);
}
} catch (Exception e) {
logger.error("批量启动失败!", e);
......@@ -525,7 +525,7 @@ public class RoleController extends BaseController {
}
map.put("status", "201");
map.put("message", "禁用成功");
return ResponseEntity.status(HttpStatus.CREATED).body(map);
return ResponseEntity.status(HttpStatus.OK).body(map);
} catch (Exception e) {
logger.error("禁用用户出错!", e);
}
......@@ -566,7 +566,7 @@ public class RoleController extends BaseController {
} else {
map.put("status", "201");
map.put("message", "禁用成功");
return ResponseEntity.status(HttpStatus.CREATED).body(map);
return ResponseEntity.status(HttpStatus.OK).body(map);
}
} catch (Exception e) {
logger.error("用户禁用失败!", e);
......@@ -627,13 +627,13 @@ public class RoleController extends BaseController {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(map);
}
map.put("status", 201);
map.put("status", 200);
String message = "删除成功";
if (!"".equals(selectRoleIds) && flag) {
message = "系统默认角色不能被删除，其他选中角色删除成功";
}
map.put("message", message);
return ResponseEntity.status(HttpStatus.CREATED).body(map);
return ResponseEntity.status(HttpStatus.OK).body(map);
} catch (Exception e) {
logger.error("角色删除失败!", e);
}
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java
View file @ ececd1d3
......@@ -108,7 +108,7 @@ public class TUserController extends BaseController {
user.setAreaId(areaId);
}
if (StringUtils.isNotBlank(status)) {
if (AuditOperationEnum.UNABLE.name().equals(status)||AuditOperationEnum.DISABLE.name().equals(status)) {
if (AuditOperationEnum.ENABLE.name().equals(status)||AuditOperationEnum.DISABLE.name().equals(status)) {
user.setStatus(status);
} else {
user.setAuditStatus(status);
......@@ -143,7 +143,7 @@ public class TUserController extends BaseController {
user.setAuditStatus(auditStatus);
}
if (StringUtils.isNotBlank(status)) {
if (AuditOperationEnum.UNABLE.name().equals(status)||AuditOperationEnum.DISABLE.name().equals(status)) {
if (AuditOperationEnum.ENABLE.name().equals(status)||AuditOperationEnum.DISABLE.name().equals(status)) {
user.setStatus(status);
} else {
user.setAuditStatus(status);
......@@ -246,7 +246,7 @@ public class TUserController extends BaseController {
user.setPasswordHash(passwordHash);
user.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
user.setUpdateTime(user.getCreateTime());
user.setStatus(AuditOperationEnum.UNABLE.name());
user.setStatus(AuditOperationEnum.ENABLE.name());
user.setAuditStatus(AuditStatusEnum.APPROVED_FINAL.name());
user.setIsDeleted(false);
......@@ -468,14 +468,14 @@ public class TUserController extends BaseController {
@ApiOperation(value = "启用")
@RequestMapping(value = "/enable", method = RequestMethod.PUT)
@RequiresPermissions("/user/enable")
@MethodLog(operModule = OperModule.USER, operType = OperType.UNABLE)
@MethodLog(operModule = OperModule.USER, operType = OperType.ENABLE)
public ResponseEntity<Map<String, Object>> enableUser(String userId) {
try {
Map<String, Object> map = new HashMap<>();
TUser entity = new TUser();
entity.setId(userId);
entity.setStatus(AuditOperationEnum.UNABLE.name());
entity.setStatus(AuditOperationEnum.ENABLE.name());
entity.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
boolean ret = this.userService.updateById(entity);
if (!ret) {
......@@ -621,7 +621,7 @@ public class TUserController extends BaseController {
user.setUpdateTime(user.getCreateTime());
user.setIsDeleted(false);
user.setPermanent(true);
user.setStatus(AuditOperationEnum.UNABLE.name());
user.setStatus(AuditOperationEnum.ENABLE.name());
user.setAuditStatus(AuditStatusEnum.APPROVED_FINAL.name());
user.setType("3");
......@@ -694,7 +694,7 @@ public class TUserController extends BaseController {
user.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
user.setUpdateTime(user.getCreateTime());
user.setIsDeleted(false);
user.setStatus(AuditOperationEnum.UNABLE.name());
user.setStatus(AuditOperationEnum.ENABLE.name());
user.setAuditStatus(AuditStatusEnum.APPROVED_FINAL.name());
user.setType("4");
......@@ -759,7 +759,7 @@ public class TUserController extends BaseController {
user.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
user.setUpdateTime(user.getCreateTime());
user.setIsDeleted(false);
user.setStatus(AuditOperationEnum.UNABLE.name());
user.setStatus(AuditOperationEnum.ENABLE.name());
user.setAuditStatus(AuditStatusEnum.APPROVED_FINAL.name());
user.setType("5");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment