RequestBody

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/GlobalDictController.java

@@ -61,7 +61,7 @@ public class GlobalDictController {
     @ApiOperationSupport(ignoreParameters = {"globalDictDto.dictId"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody GlobalDictDto globalDictDto) {
+    public ResponseResult<Long> add(@RequestBody GlobalDictDto globalDictDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(globalDictDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -84,7 +84,7 @@ public class GlobalDictController {
      */
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
-    public ResponseResult<Void> update(@MyRequestBody GlobalDictDto globalDictDto) {
+    public ResponseResult<Void> update(@RequestBody GlobalDictDto globalDictDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(globalDictDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -116,7 +116,7 @@ public class GlobalDictController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody(required = true) Long dictId) {
+    public ResponseResult<Void> delete(@RequestBody(required = true) Long dictId) {
         if (!globalDictService.remove(dictId)) {
             String errorMessage = "数据操作失败，全局字典Id不存在，请刷新后重试！";
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
@@ -134,9 +134,9 @@ public class GlobalDictController {
      */
     @PostMapping("/list")
     public ResponseResult<MyPageData<GlobalDictVo>> list(
-            @MyRequestBody GlobalDictDto globalDictDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
+            @RequestBody GlobalDictDto globalDictDtoFilter,
+            @RequestBody MyOrderParam orderParam,
+            @RequestBody MyPageParam pageParam) {
         if (pageParam != null) {
             PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
         }
@@ -161,7 +161,7 @@ public class GlobalDictController {
     @ApiOperationSupport(ignoreParameters = {"globalDictItemDto.id"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/addItem")
-    public ResponseResult<Long> addItem(@MyRequestBody GlobalDictItemDto globalDictItemDto) {
+    public ResponseResult<Long> addItem(@RequestBody GlobalDictItemDto globalDictItemDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(globalDictItemDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -188,7 +188,7 @@ public class GlobalDictController {
      */
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/updateItem")
-    public ResponseResult<Void> updateItem(@MyRequestBody GlobalDictItemDto globalDictItemDto) {
+    public ResponseResult<Void> updateItem(@RequestBody GlobalDictItemDto globalDictItemDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(globalDictItemDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -225,8 +225,7 @@ public class GlobalDictController {
      */
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/updateItemStatus")
-    public ResponseResult<Void> updateItemStatus(
-            @MyRequestBody(required = true) Long id, @MyRequestBody(required = true) Integer status) {
+    public ResponseResult<Void> updateItemStatus(@RequestBody(required = true) Long id, @RequestBody(required = true) Integer status) {
         String errorMessage;
         GlobalDictItem dictItem = globalDictItemService.getById(id);
         if (dictItem == null) {
@@ -247,7 +246,7 @@ public class GlobalDictController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/deleteItem")
-    public ResponseResult<Void> deleteItem(@MyRequestBody(required = true) Long id) {
+    public ResponseResult<Void> deleteItem(@RequestBody(required = true) Long id) {
         String errorMessage;
         GlobalDictItem dictItem = globalDictItemService.getById(id);
         if (dictItem == null) {
@@ -286,8 +285,7 @@ public class GlobalDictController {
      * @return 应答结果对象，包含字典形式的数据集合。
      */
     @PostMapping("/listDictByIds")
-    public ResponseResult<List<Map<String, Object>>> listDictByIds(
-            @MyRequestBody(required = true) String dictCode, @MyRequestBody List<String> itemIds) {
+    public ResponseResult<List<Map<String, Object>>> listDictByIds(@RequestBody(required = true) String dictCode, @RequestBody List<String> itemIds) {
         List<GlobalDictItem> resultList =
                 globalDictService.getGlobalDictItemListFromCache(dictCode, new HashSet<>(itemIds));
         return ResponseResult.success(

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/LoginUserController.java

@@ -12,6 +12,7 @@ import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -40,8 +41,7 @@ public class LoginUserController {
      * @return 登录用户信息列表。
      */
     @PostMapping("/list")
-    public ResponseResult<MyPageData<LoginUserInfo>> list(
-            @MyRequestBody String loginName, @MyRequestBody MyPageParam pageParam) {
+    public ResponseResult<MyPageData<LoginUserInfo>> list(@RequestBody String loginName, @RequestBody MyPageParam pageParam) {
         int queryCount = pageParam.getPageNum() * pageParam.getPageSize();
         int skipCount = (pageParam.getPageNum() - 1) * pageParam.getPageSize();
         String patternKey;
@@ -68,7 +68,7 @@ public class LoginUserController {
      * @return 应答结果对象。
      */
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody String sessionId) {
+    public ResponseResult<Void> delete(@RequestBody String sessionId) {
         // 为了保证被剔除用户正在进行的操作不被干扰，这里只是删除sessionIdKey即可，这样可以使强制下线操作更加平滑。
         // 比如，如果删除操作权限或数据权限的redis session key，那么正在请求数据的操作就会报错。
         redissonClient.getBucket(RedisKeyUtil.makeSessionIdKey(sessionId)).delete();

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysDataPermController.java

@@ -61,9 +61,9 @@ public class SysDataPermController {
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
     public ResponseResult<String> add(
-            @MyRequestBody SysDataPermDto sysDataPermDto,
-            @MyRequestBody String deptIdListString,
-            @MyRequestBody String menuIdListString) {
+            @RequestBody SysDataPermDto sysDataPermDto,
+            @RequestBody String deptIdListString,
+            @RequestBody String menuIdListString) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysDataPermDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -102,9 +102,9 @@ public class SysDataPermController {
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
     public ResponseResult<Void> update(
-            @MyRequestBody SysDataPermDto sysDataPermDto,
-            @MyRequestBody String deptIdListString,
-            @MyRequestBody String menuIdListString) {
+            @RequestBody SysDataPermDto sysDataPermDto,
+            @RequestBody String deptIdListString,
+            @RequestBody String menuIdListString) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysDataPermDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -144,7 +144,7 @@ public class SysDataPermController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody String dataPermId) {
+    public ResponseResult<Void> delete(@RequestBody String dataPermId) {
         if (MyCommonUtil.existBlankArgument(dataPermId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -165,9 +165,9 @@ public class SysDataPermController {
      */
     @PostMapping("/list")
     public ResponseResult<MyPageData<SysDataPermVo>> list(
-            @MyRequestBody SysDataPermDto sysDataPermDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
+            @RequestBody SysDataPermDto sysDataPermDtoFilter,
+            @RequestBody MyOrderParam orderParam,
+            @RequestBody MyPageParam pageParam) {
         if (pageParam != null) {
             PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
         }
@@ -213,10 +213,10 @@ public class SysDataPermController {
      */
     @PostMapping("/listNotInDataPermUser")
     public ResponseResult<MyPageData<SysUserVo>> listNotInDataPermUser(
-            @MyRequestBody Long dataPermId,
-            @MyRequestBody SysUserDto sysUserDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
+            @RequestBody Long dataPermId,
+            @RequestBody SysUserDto sysUserDtoFilter,
+            @RequestBody MyOrderParam orderParam,
+            @RequestBody MyPageParam pageParam) {
         ResponseResult<Void> verifyResult = this.doDataPermUserVerify(dataPermId);
         if (!verifyResult.isSuccess()) {
             return ResponseResult.errorFrom(verifyResult);
@@ -242,10 +242,10 @@ public class SysDataPermController {
      */
     @PostMapping("/listDataPermUser")
     public ResponseResult<MyPageData<SysUserVo>> listDataPermUser(
-            @MyRequestBody Long dataPermId,
-            @MyRequestBody SysUserDto sysUserDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
+            @RequestBody Long dataPermId,
+            @RequestBody SysUserDto sysUserDtoFilter,
+            @RequestBody MyOrderParam orderParam,
+            @RequestBody MyPageParam pageParam) {
         ResponseResult<Void> verifyResult = this.doDataPermUserVerify(dataPermId);
         if (!verifyResult.isSuccess()) {
             return ResponseResult.errorFrom(verifyResult);
@@ -279,8 +279,7 @@ public class SysDataPermController {
      */
     @OperationLog(type = SysOperationLogType.ADD_M2M)
     @PostMapping("/addDataPermUser")
-    public ResponseResult<Void> addDataPermUser(
-            @MyRequestBody String dataPermId, @MyRequestBody String userIdListString) {
+    public ResponseResult<Void> addDataPermUser(@RequestBody String dataPermId, @RequestBody String userIdListString) {
         if (MyCommonUtil.existBlankArgument(dataPermId, userIdListString)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -303,8 +302,7 @@ public class SysDataPermController {
      */
     @OperationLog(type = SysOperationLogType.DELETE_M2M)
     @PostMapping("/deleteDataPermUser")
-    public ResponseResult<Void> deleteDataPermUser(
-            @MyRequestBody String dataPermId, @MyRequestBody String userId) {
+    public ResponseResult<Void> deleteDataPermUser(@RequestBody String dataPermId, @RequestBody String userId) {
         if (MyCommonUtil.existBlankArgument(dataPermId, userId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysDeptController.java

@@ -53,7 +53,7 @@ public class SysDeptController {
     @ApiOperationSupport(ignoreParameters = {"sysDeptDto.deptId"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<String> add(@MyRequestBody SysDeptDto sysDeptDto) {
+    public ResponseResult<String> add(@RequestBody SysDeptDto sysDeptDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysDeptDto, false);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -80,7 +80,7 @@ public class SysDeptController {
      */
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
-    public ResponseResult<Void> update(@MyRequestBody SysDeptDto sysDeptDto) {
+    public ResponseResult<Void> update(@RequestBody SysDeptDto sysDeptDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysDeptDto, true);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -116,7 +116,7 @@ public class SysDeptController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody String deptId) {
+    public ResponseResult<Void> delete(@RequestBody String deptId) {
         String errorMessage;
         if (MyCommonUtil.existBlankArgument(deptId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
@@ -227,10 +227,10 @@ public class SysDeptController {
      */
     @PostMapping("/listNotInSysDeptPost")
     public ResponseResult<MyPageData<SysPostVo>> listNotInSysDeptPost(
-            @MyRequestBody Long deptId,
-            @MyRequestBody SysPostDto sysPostDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
+            @RequestBody Long deptId,
+            @RequestBody SysPostDto sysPostDtoFilter,
+            @RequestBody MyOrderParam orderParam,
+            @RequestBody MyPageParam pageParam) {
         if (MyCommonUtil.isNotBlankOrNull(deptId) && !sysDeptService.existId(deptId)) {
             return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
         }
@@ -260,10 +260,10 @@ public class SysDeptController {
      */
     @PostMapping("/listSysDeptPost")
     public ResponseResult<MyPageData<SysPostVo>> listSysDeptPost(
-            @MyRequestBody(required = true) Long deptId,
-            @MyRequestBody SysPostDto sysPostDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
+            @RequestBody(required = true) Long deptId,
+            @RequestBody SysPostDto sysPostDtoFilter,
+            @RequestBody MyOrderParam orderParam,
+            @RequestBody MyPageParam pageParam) {
         if (!sysDeptService.existId(deptId)) {
             return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
         }
@@ -285,8 +285,8 @@ public class SysDeptController {
      */
     @PostMapping("/addSysDeptPost")
     public ResponseResult<Void> addSysDeptPost(
-            @MyRequestBody String deptId,
-            @MyRequestBody List<SysDeptPostDto> sysDeptPostDtoList) {
+            @RequestBody String deptId,
+            @RequestBody List<SysDeptPostDto> sysDeptPostDtoList) {
         if (MyCommonUtil.existBlankArgument(deptId, sysDeptPostDtoList)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -310,7 +310,7 @@ public class SysDeptController {
      * @return 应答结果对象。
      */
     @PostMapping("/updateSysDeptPost")
-    public ResponseResult<Void> updateSysDeptPost(@MyRequestBody SysDeptPostDto sysDeptPostDto) {
+    public ResponseResult<Void> updateSysDeptPost(@RequestBody SysDeptPostDto sysDeptPostDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysDeptPostDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -350,7 +350,7 @@ public class SysDeptController {
      * @return 应答结果对象。
      */
     @PostMapping("/deleteSysDeptPost")
-    public ResponseResult<Void> deleteSysDeptPost(@MyRequestBody String deptId, @MyRequestBody String postId) {
+    public ResponseResult<Void> deleteSysDeptPost(@RequestBody String deptId, @RequestBody String postId) {
         if (MyCommonUtil.existBlankArgument(deptId, postId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -393,7 +393,7 @@ public class SysDeptController {
      * @return 应答结果对象，包含字典形式的数据集合。
      */
     @PostMapping("/listDictByIds")
-    public ResponseResult<List<Map<String, Object>>> listDictByIds(@MyRequestBody List<Long> dictIds) {
+    public ResponseResult<List<Map<String, Object>>> listDictByIds(@RequestBody List<Long> dictIds) {
         List<SysDept> resultList = sysDeptService.getInList(new HashSet<>(dictIds));
         return ResponseResult.success(BeanQuery.select(
                 "parentId as parentId", "deptId as id", "deptName as name").executeFrom(resultList));

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysMenuController.java

@@ -56,7 +56,7 @@ public class SysMenuController {
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
     public ResponseResult<Long> add(
-            @MyRequestBody SysMenuDto sysMenuDto, @MyRequestBody String permCodeIdListString) {
+            @RequestBody SysMenuDto sysMenuDto, @RequestBody String permCodeIdListString) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysMenuDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -96,7 +96,7 @@ public class SysMenuController {
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
     public ResponseResult<Void> update(
-            @MyRequestBody SysMenuDto sysMenuDto, @MyRequestBody String permCodeIdListString) {
+            @RequestBody SysMenuDto sysMenuDto, @RequestBody String permCodeIdListString) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysMenuDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -146,7 +146,7 @@ public class SysMenuController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody Long menuId) {
+    public ResponseResult<Void> delete(@RequestBody Long menuId) {
         if (MyCommonUtil.existBlankArgument(menuId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysOperationLogController.java

@@ -42,9 +42,9 @@ public class SysOperationLogController {
      */
     @PostMapping("/list")
     public ResponseResult<MyPageData<SysOperationLogVo>> list(
-            @MyRequestBody SysOperationLogDto sysOperationLogDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
+            @RequestBody SysOperationLogDto sysOperationLogDtoFilter,
+            @RequestBody MyOrderParam orderParam,
+            @RequestBody MyPageParam pageParam) {
         if (pageParam != null) {
             PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
         }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysPermCodeController.java

@@ -48,7 +48,7 @@ public class SysPermCodeController {
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
     public ResponseResult<Long> add(
-            @MyRequestBody SysPermCodeDto sysPermCodeDto, @MyRequestBody String permIdListString) {
+            @RequestBody SysPermCodeDto sysPermCodeDto, @RequestBody String permIdListString) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysPermCodeDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED);
@@ -77,7 +77,7 @@ public class SysPermCodeController {
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
     public ResponseResult<Void> update(
-            @MyRequestBody SysPermCodeDto sysPermCodeDto, @MyRequestBody String permIdListString) {
+            @RequestBody SysPermCodeDto sysPermCodeDto, @RequestBody String permIdListString) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysPermCodeDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -117,7 +117,7 @@ public class SysPermCodeController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody Long permCodeId) {
+    public ResponseResult<Void> delete(@RequestBody Long permCodeId) {
         if (MyCommonUtil.existBlankArgument(permCodeId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysPermController.java

@@ -13,7 +13,6 @@ import com.ankaibei.workFlow.common.core.constant.ErrorCodeEnum;
 import com.ankaibei.workFlow.common.core.object.*;
 import com.ankaibei.workFlow.common.core.util.*;
 import com.ankaibei.workFlow.common.core.validator.UpdateGroup;
-import com.ankaibei.workFlow.common.core.annotation.MyRequestBody;
 import com.ankaibei.workFlow.common.log.annotation.OperationLog;
 import com.ankaibei.workFlow.common.log.model.constant.SysOperationLogType;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +46,7 @@ public class SysPermController {
     @ApiOperationSupport(ignoreParameters = {"sysPermDto.permId"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody SysPermDto sysPermDto) {
+    public ResponseResult<Long> add(@RequestBody SysPermDto sysPermDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysPermDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -69,7 +68,7 @@ public class SysPermController {
      */
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
-    public ResponseResult<Void> update(@MyRequestBody SysPermDto sysPermDto) {
+    public ResponseResult<Void> update(@RequestBody SysPermDto sysPermDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysPermDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -96,7 +95,7 @@ public class SysPermController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody Long permId) {
+    public ResponseResult<Void> delete(@RequestBody Long permId) {
         if (MyCommonUtil.existBlankArgument(permId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -134,8 +133,7 @@ public class SysPermController {
      * @return 应答结果对象，包含权限资源列表。
      */
     @PostMapping("/list")
-    public ResponseResult<MyPageData<SysPermVo>> list(
-            @MyRequestBody SysPermDto sysPermDtoFilter, @MyRequestBody MyPageParam pageParam) {
+    public ResponseResult<MyPageData<SysPermVo>> list(@RequestBody SysPermDto sysPermDtoFilter, @RequestBody MyPageParam pageParam) {
         if (pageParam != null) {
             PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
         }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysPermModuleController.java

@@ -12,7 +12,6 @@ import com.ankaibei.workFlow.common.core.constant.ErrorCodeEnum;
 import com.ankaibei.workFlow.common.core.object.*;
 import com.ankaibei.workFlow.common.core.util.*;
 import com.ankaibei.workFlow.common.core.validator.UpdateGroup;
-import com.ankaibei.workFlow.common.core.annotation.MyRequestBody;
 import com.ankaibei.workFlow.common.log.annotation.OperationLog;
 import com.ankaibei.workFlow.common.log.model.constant.SysOperationLogType;
 import org.apache.commons.collections4.CollectionUtils;
@@ -49,7 +48,7 @@ public class SysPermModuleController {
     @ApiOperationSupport(ignoreParameters = {"sysPermModuleDto.moduleId"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody SysPermModuleDto sysPermModuleDto) {
+    public ResponseResult<Long> add(@RequestBody SysPermModuleDto sysPermModuleDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysPermModuleDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -72,7 +71,7 @@ public class SysPermModuleController {
      */
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
-    public ResponseResult<Void> update(@MyRequestBody SysPermModuleDto sysPermModuleDto) {
+    public ResponseResult<Void> update(@RequestBody SysPermModuleDto sysPermModuleDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysPermModuleDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -104,7 +103,7 @@ public class SysPermModuleController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody Long moduleId) {
+    public ResponseResult<Void> delete(@RequestBody Long moduleId) {
         if (MyCommonUtil.existBlankArgument(moduleId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysPostController.java

@@ -1,5 +1,6 @@
 package com.ankaibei.workFlow.webadmin.upms.controller;
 
+import com.ankaibei.workFlow.common.core.annotation.MyRequestBody;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import cn.jimmyshi.beanquery.BeanQuery;
@@ -7,7 +8,6 @@ import com.github.pagehelper.page.PageMethod;
 import com.ankaibei.workFlow.common.core.object.*;
 import com.ankaibei.workFlow.common.core.util.*;
 import com.ankaibei.workFlow.common.core.constant.*;
-import com.ankaibei.workFlow.common.core.annotation.MyRequestBody;
 import com.ankaibei.workFlow.common.core.validator.UpdateGroup;
 import com.ankaibei.workFlow.webadmin.upms.dto.SysPostDto;
 import com.ankaibei.workFlow.webadmin.upms.model.SysPost;
@@ -46,7 +46,7 @@ public class SysPostController {
     @ApiOperationSupport(ignoreParameters = {"sysPostDto.postId"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody SysPostDto sysPostDto) {
+    public ResponseResult<Long> add(@RequestBody SysPostDto sysPostDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysPostDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -64,7 +64,7 @@ public class SysPostController {
      */
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
-    public ResponseResult<Void> update(@MyRequestBody SysPostDto sysPostDto) {
+    public ResponseResult<Void> update(@RequestBody SysPostDto sysPostDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysPostDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -90,7 +90,7 @@ public class SysPostController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody String postId) {
+    public ResponseResult<Void> delete(@RequestBody String postId) {
         String errorMessage;
         if (MyCommonUtil.existBlankArgument(postId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
@@ -118,10 +118,7 @@ public class SysPostController {
      * @return 应答结果对象，包含查询结果集。
      */
     @PostMapping("/list")
-    public ResponseResult<MyPageData<SysPostVo>> list(
-            @MyRequestBody SysPostDto sysPostDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
+    public ResponseResult<MyPageData<SysPostVo>> list(@RequestBody SysPostDto sysPostDtoFilter, @RequestBody MyOrderParam orderParam, @RequestBody MyPageParam pageParam) {
         if (pageParam != null) {
             PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
         }
@@ -170,7 +167,7 @@ public class SysPostController {
      * @return 应答结果对象，包含字典形式的数据集合。
      */
     @PostMapping("/listDictByIds")
-    public ResponseResult<List<Map<String, Object>>> listDictByIds(@MyRequestBody List<Long> postIds) {
+    public ResponseResult<List<Map<String, Object>>> listDictByIds(@RequestBody List<Long> postIds) {
         List<SysPost> resultList = sysPostService.getInList(new HashSet<>(postIds));
         return ResponseResult.success(BeanQuery.select("postId as id", "postName as name").executeFrom(resultList));
     }

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysRoleController.java

@@ -20,7 +20,6 @@ import com.ankaibei.workFlow.common.core.validator.UpdateGroup;
 import com.ankaibei.workFlow.common.core.constant.ErrorCodeEnum;
 import com.ankaibei.workFlow.common.core.object.*;
 import com.ankaibei.workFlow.common.core.util.*;
-import com.ankaibei.workFlow.common.core.annotation.MyRequestBody;
 import com.ankaibei.workFlow.common.log.annotation.OperationLog;
 import com.ankaibei.workFlow.common.log.model.constant.SysOperationLogType;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,8 +56,7 @@ public class SysRoleController {
     @ApiOperationSupport(ignoreParameters = {"sysRoleDto.roleId", "sysRoleDto.createTimeStart", "sysRoleDto.createTimeEnd"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<String> add(
-            @MyRequestBody SysRoleDto sysRoleDto, @MyRequestBody String menuIdListString) {
+    public ResponseResult<String> add(@RequestBody SysRoleDto sysRoleDto, @RequestBody String menuIdListString) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysRoleDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -87,8 +85,7 @@ public class SysRoleController {
     @ApiOperationSupport(ignoreParameters = {"sysRoleDto.createTimeStart", "sysRoleDto.createTimeEnd"})
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
-    public ResponseResult<Void> update(
-            @MyRequestBody SysRoleDto sysRoleDto, @MyRequestBody String menuIdListString) {
+    public ResponseResult<Void> update(@RequestBody SysRoleDto sysRoleDto, @RequestBody String menuIdListString) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysRoleDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -123,7 +120,7 @@ public class SysRoleController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody String roleId) {
+    public ResponseResult<Void> delete(@RequestBody String roleId) {
         if (MyCommonUtil.existBlankArgument(roleId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -143,10 +140,9 @@ public class SysRoleController {
      * @return 应答结果对象，包含角色列表。
      */
     @PostMapping("/list")
-    public ResponseResult<MyPageData<SysRoleVo>> list(
-            @MyRequestBody SysRoleDto sysRoleDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
+    public ResponseResult<MyPageData<SysRoleVo>> list(@RequestBody SysRoleDto sysRoleDtoFilter,
+                                                      @RequestBody MyOrderParam orderParam,
+                                                      @RequestBody MyPageParam pageParam) {
         if (pageParam != null) {
             PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
         }
@@ -191,11 +187,10 @@ public class SysRoleController {
      * @return 应答结果对象，包含用户列表数据。
      */
     @PostMapping("/listNotInUserRole")
-    public ResponseResult<MyPageData<SysUserVo>> listNotInUserRole(
-            @MyRequestBody Long roleId,
-            @MyRequestBody SysUserDto sysUserDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
+    public ResponseResult<MyPageData<SysUserVo>> listNotInUserRole(@RequestBody Long roleId,
+                                                                   @RequestBody SysUserDto sysUserDtoFilter,
+                                                                   @RequestBody MyOrderParam orderParam,
+                                                                   @RequestBody MyPageParam pageParam) {
         ResponseResult<Void> verifyResult = this.doRoleUserVerify(roleId);
         if (!verifyResult.isSuccess()) {
             return ResponseResult.errorFrom(verifyResult);
@@ -219,11 +214,7 @@ public class SysRoleController {
      * @return 应答结果对象，包含用户列表数据。
      */
     @PostMapping("/listUserRole")
-    public ResponseResult<MyPageData<SysUserVo>> listUserRole(
-            @MyRequestBody Long roleId,
-            @MyRequestBody SysUserDto sysUserDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
+    public ResponseResult<MyPageData<SysUserVo>> listUserRole(@RequestBody Long roleId, @RequestBody SysUserDto sysUserDtoFilter, @RequestBody MyOrderParam orderParam, @RequestBody MyPageParam pageParam) {
         ResponseResult<Void> verifyResult = this.doRoleUserVerify(roleId);
         if (!verifyResult.isSuccess()) {
             return ResponseResult.errorFrom(verifyResult);
@@ -256,8 +247,7 @@ public class SysRoleController {
      */
     @OperationLog(type = SysOperationLogType.ADD_M2M)
     @PostMapping("/addUserRole")
-    public ResponseResult<Void> addUserRole(
-            @MyRequestBody String roleId, @MyRequestBody String userIdListString) {
+    public ResponseResult<Void> addUserRole(@RequestBody String roleId, @RequestBody String userIdListString) {
         if (MyCommonUtil.existBlankArgument(roleId, userIdListString)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -287,8 +277,7 @@ public class SysRoleController {
      */
     @OperationLog(type = SysOperationLogType.DELETE_M2M)
     @PostMapping("/deleteUserRole")
-    public ResponseResult<Void> deleteUserRole(
-            @MyRequestBody String roleId, @MyRequestBody String userId) {
+    public ResponseResult<Void> deleteUserRole(@RequestBody String roleId, @RequestBody String userId) {
         if (MyCommonUtil.existBlankArgument(roleId, userId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -319,7 +308,7 @@ public class SysRoleController {
      * @return 应答结果对象，包含字典形式的数据集合。
      */
     @PostMapping("/listDictByIds")
-    public ResponseResult<List<Map<String, Object>>> listDictByIds(@MyRequestBody List<Long> dictIds) {
+    public ResponseResult<List<Map<String, Object>>> listDictByIds(@RequestBody List<Long> dictIds) {
         List<SysRole> resultList = sysRoleService.getInList(new HashSet<>(dictIds));
         return ResponseResult.success(BeanQuery.select(
                 "roleId as id", "roleName as name").executeFrom(resultList));

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/upms/controller/SysUserController.java

@@ -16,7 +16,6 @@ import com.ankaibei.workFlow.webadmin.upms.service.*;
 import com.ankaibei.workFlow.common.core.object.*;
 import com.ankaibei.workFlow.common.core.util.*;
 import com.ankaibei.workFlow.common.core.constant.*;
-import com.ankaibei.workFlow.common.core.annotation.MyRequestBody;
 import com.ankaibei.workFlow.common.redis.cache.SessionCacheHelper;
 import com.ankaibei.workFlow.webadmin.config.ApplicationConfig;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -66,9 +65,7 @@ public class SysUserController {
             "sysUserDto.createTimeEnd"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(
-            @MyRequestBody SysUserDto sysUserDto,
-            @MyRequestBody String deptPostIdListString) {
+    public ResponseResult<Long> add(@RequestBody SysUserDto sysUserDto, @RequestBody String deptPostIdListString) {
 
         //角色是查看全部，前台已取消对角色的控制   这里直接写死
         String roleIdListString = "1575681957692444672";
@@ -90,12 +87,9 @@ public class SysUserController {
         if (!result.isSuccess()) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, result.getErrorMessage());
         }
-        Set<Long> deptPostIdSet = result.getData().getObject("deptPostIdSet", new TypeReference<Set<Long>>() {
-        });
-        Set<Long> roleIdSet = result.getData().getObject("roleIdSet", new TypeReference<Set<Long>>() {
-        });
-        Set<Long> dataPermIdSet = result.getData().getObject("dataPermIdSet", new TypeReference<Set<Long>>() {
-        });
+        Set<Long> deptPostIdSet = result.getData().getObject("deptPostIdSet", new TypeReference<Set<Long>>() {});
+        Set<Long> roleIdSet = result.getData().getObject("roleIdSet", new TypeReference<Set<Long>>() {});
+        Set<Long> dataPermIdSet = result.getData().getObject("dataPermIdSet", new TypeReference<Set<Long>>() {});
         sysUser.setUserType(1);
         sysUserService.saveNew(sysUser, roleIdSet, deptPostIdSet, dataPermIdSet);
         return ResponseResult.success(Long.parseLong(sysUser.getUserId()));
@@ -114,8 +108,8 @@ public class SysUserController {
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
     public ResponseResult<Void> update(
-            @MyRequestBody SysUserDto sysUserDto,
-            @MyRequestBody String deptPostIdListString) {
+            @RequestBody SysUserDto sysUserDto,
+            @RequestBody String deptPostIdListString) {
         String errorMessage = MyCommonUtil.getModelValidationError(sysUserDto, true);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -158,7 +152,7 @@ public class SysUserController {
      * @return 应答结果对象。
      */
     @PostMapping("/resetPassword")
-    public ResMsg resetPassword(@MyRequestBody Long userId) {
+    public ResMsg resetPassword(@RequestBody Long userId) {
         if (MyCommonUtil.existBlankArgument(userId)) {
             return ResMsg.error(CodeEnum.ARGUMENT_NULL_EXIST.getCode(), CodeEnum.ARGUMENT_NULL_EXIST.toString());
         }
@@ -176,7 +170,7 @@ public class SysUserController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody String userId) {
+    public ResponseResult<Void> delete(@RequestBody String userId) {
         String errorMessage;
         if (MyCommonUtil.existBlankArgument(userId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
@@ -191,8 +185,7 @@ public class SysUserController {
      * @return 应答结果对象，包含查询结果集。
      */
     @PostMapping("/list")
-    public ResMsg list(
-            @RequestBody SysUserDto sysUserDtoFilter) {
+    public ResMsg list(@RequestBody SysUserDto sysUserDtoFilter) {
         if (sysUserDtoFilter.getPageNum() != null && sysUserDtoFilter.getPageSize() != null) {
             PageMethod.startPage(sysUserDtoFilter.getPageNum(), sysUserDtoFilter.getPageSize());
         }

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/controller/FlowCategoryController.java

@@ -6,7 +6,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.jimmyshi.beanquery.BeanQuery;
 import com.github.pagehelper.page.PageMethod;
-import com.ankaibei.workFlow.common.core.annotation.MyRequestBody;
 import com.ankaibei.workFlow.common.core.constant.ErrorCodeEnum;
 import com.ankaibei.workFlow.common.core.object.*;
 import com.ankaibei.workFlow.common.core.util.MyCommonUtil;
@@ -55,7 +54,7 @@ public class FlowCategoryController {
     @ApiOperationSupport(ignoreParameters = {"flowCategoryDto.categoryId"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody FlowCategoryDto flowCategoryDto) {
+    public ResponseResult<Long> add(@RequestBody FlowCategoryDto flowCategoryDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(flowCategoryDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -73,7 +72,7 @@ public class FlowCategoryController {
      */
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
-    public ResponseResult<Void> update(@MyRequestBody FlowCategoryDto flowCategoryDto) {
+    public ResponseResult<Void> update(@RequestBody FlowCategoryDto flowCategoryDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(flowCategoryDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -108,7 +107,7 @@ public class FlowCategoryController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody Long categoryId) {
+    public ResponseResult<Void> delete(@RequestBody Long categoryId) {
         String errorMessage;
         if (MyCommonUtil.existBlankArgument(categoryId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
@@ -143,9 +142,9 @@ public class FlowCategoryController {
      */
     @PostMapping("/list")
     public ResponseResult<MyPageData<FlowCategoryVo>> list(
-            @MyRequestBody FlowCategoryDto flowCategoryDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
+            @RequestBody FlowCategoryDto flowCategoryDtoFilter,
+            @RequestBody MyOrderParam orderParam,
+            @RequestBody MyPageParam pageParam) {
         if (pageParam != null) {
             PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
         }
@@ -195,7 +194,7 @@ public class FlowCategoryController {
      * @return 应答结果对象，包含字典形式的数据集合。
      */
     @PostMapping("/listDictByIds")
-    public ResponseResult<List<Map<String, Object>>> listDictByIds(@MyRequestBody List<Long> dictIds) {
+    public ResponseResult<List<Map<String, Object>>> listDictByIds(@RequestBody List<Long> dictIds) {
         List<FlowCategory> resultList = flowCategoryService.getInList(new HashSet<>(dictIds));
         return ResponseResult.success(BeanQuery.select(
                 "categoryId as id", "name as name").executeFrom(resultList));

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/controller/FlowEntryController.java

@@ -10,7 +10,6 @@ import cn.jimmyshi.beanquery.BeanQuery;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.page.PageMethod;
-import com.ankaibei.workFlow.common.core.annotation.MyRequestBody;
 import com.ankaibei.workFlow.common.core.constant.ErrorCodeEnum;
 import com.ankaibei.workFlow.common.core.object.*;
 import com.ankaibei.workFlow.common.core.util.MyCommonUtil;
@@ -71,7 +70,7 @@ public class FlowEntryController {
     @ApiOperationSupport(ignoreParameters = {"flowEntryDto.entryId"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody FlowEntryDto flowEntryDto) {
+    public ResponseResult<Long> add(@RequestBody FlowEntryDto flowEntryDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(flowEntryDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -99,7 +98,7 @@ public class FlowEntryController {
      */
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
-    public ResponseResult<Void> update(@MyRequestBody FlowEntryDto flowEntryDto) {
+    public ResponseResult<Void> update(@RequestBody FlowEntryDto flowEntryDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(flowEntryDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -146,7 +145,7 @@ public class FlowEntryController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody Long entryId) {
+    public ResponseResult<Void> delete(@RequestBody Long entryId) {
         String errorMessage;
         if (MyCommonUtil.existBlankArgument(entryId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
@@ -176,7 +175,7 @@ public class FlowEntryController {
      */
     @OperationLog(type = SysOperationLogType.PUBLISH)
     @PostMapping("/publish")
-    public ResponseResult<Void> publish(@MyRequestBody(required = true) Long entryId) throws XMLStreamException {
+    public ResponseResult<Void> publish(@RequestBody(required = true) Long entryId) throws XMLStreamException {
         String errorMessage;
         FlowEntry flowEntry = flowEntryService.getById(entryId);
         if (flowEntry == null) {
@@ -207,9 +206,9 @@ public class FlowEntryController {
      */
     @PostMapping("/list")
     public ResponseResult<MyPageData<FlowEntryVo>> list(
-            @MyRequestBody FlowEntryDto flowEntryDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
+            @RequestBody FlowEntryDto flowEntryDtoFilter,
+            @RequestBody MyOrderParam orderParam,
+            @RequestBody MyPageParam pageParam) {
         if (pageParam != null) {
             PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
         }
@@ -292,8 +291,8 @@ public class FlowEntryController {
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/updateMainVersion")
     public ResponseResult<Void> updateMainVersion(
-            @MyRequestBody(required = true) Long entryId,
-            @MyRequestBody(required = true) Long newEntryPublishId) {
+            @RequestBody(required = true) Long entryId,
+            @RequestBody(required = true) Long newEntryPublishId) {
         String errorMessage;
         FlowEntryPublish flowEntryPublish = flowEntryService.getFlowEntryPublishFromCache(newEntryPublishId);
         if (flowEntryPublish == null) {
@@ -320,7 +319,7 @@ public class FlowEntryController {
      */
     @OperationLog(type = SysOperationLogType.SUSPEND)
     @PostMapping("/suspendFlowEntryPublish")
-    public ResponseResult<Void> suspendFlowEntryPublish(@MyRequestBody(required = true) Long entryPublishId) {
+    public ResponseResult<Void> suspendFlowEntryPublish(@RequestBody(required = true) Long entryPublishId) {
         String errorMessage;
         FlowEntryPublish flowEntryPublish = flowEntryService.getFlowEntryPublishFromCache(entryPublishId);
         if (flowEntryPublish == null) {
@@ -343,7 +342,7 @@ public class FlowEntryController {
      */
     @OperationLog(type = SysOperationLogType.RESUME)
     @PostMapping("/activateFlowEntryPublish")
-    public ResponseResult<Void> activateFlowEntryPublish(@MyRequestBody(required = true) Long entryPublishId) {
+    public ResponseResult<Void> activateFlowEntryPublish(@RequestBody(required = true) Long entryPublishId) {
         String errorMessage;
         FlowEntryPublish flowEntryPublish = flowEntryService.getFlowEntryPublishFromCache(entryPublishId);
         if (flowEntryPublish == null) {

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/controller/FlowEntryVariableController.java

@@ -1,5 +1,6 @@
 package com.ankaibei.workFlow.common.flow.controller;
 
+import com.ankaibei.workFlow.common.core.annotation.MyRequestBody;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import com.github.pagehelper.page.PageMethod;
@@ -10,7 +11,6 @@ import com.ankaibei.workFlow.common.flow.service.*;
 import com.ankaibei.workFlow.common.core.object.*;
 import com.ankaibei.workFlow.common.core.util.*;
 import com.ankaibei.workFlow.common.core.constant.*;
-import com.ankaibei.workFlow.common.core.annotation.MyRequestBody;
 import com.ankaibei.workFlow.common.core.validator.UpdateGroup;
 import com.ankaibei.workFlow.common.log.annotation.OperationLog;
 import com.ankaibei.workFlow.common.log.model.constant.SysOperationLogType;
@@ -45,7 +45,7 @@ public class FlowEntryVariableController {
     @ApiOperationSupport(ignoreParameters = {"flowEntryVariableDto.variableId"})
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody FlowEntryVariableDto flowEntryVariableDto) {
+    public ResponseResult<Long> add(@RequestBody FlowEntryVariableDto flowEntryVariableDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(flowEntryVariableDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -63,7 +63,7 @@ public class FlowEntryVariableController {
      */
     @OperationLog(type = SysOperationLogType.UPDATE)
     @PostMapping("/update")
-    public ResponseResult<Void> update(@MyRequestBody FlowEntryVariableDto flowEntryVariableDto) {
+    public ResponseResult<Void> update(@RequestBody FlowEntryVariableDto flowEntryVariableDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(flowEntryVariableDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -89,7 +89,7 @@ public class FlowEntryVariableController {
      */
     @OperationLog(type = SysOperationLogType.DELETE)
     @PostMapping("/delete")
-    public ResponseResult<Void> delete(@MyRequestBody Long variableId) {
+    public ResponseResult<Void> delete(@RequestBody Long variableId) {
         String errorMessage;
         if (MyCommonUtil.existBlankArgument(variableId)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
@@ -118,9 +118,9 @@ public class FlowEntryVariableController {
      */
     @PostMapping("/list")
     public ResponseResult<MyPageData<FlowEntryVariableVo>> list(
-            @MyRequestBody FlowEntryVariableDto flowEntryVariableDtoFilter,
-            @MyRequestBody MyOrderParam orderParam,
-            @MyRequestBody MyPageParam pageParam) {
+            @RequestBody FlowEntryVariableDto flowEntryVariableDtoFilter,
+            @RequestBody MyOrderParam orderParam,
+            @RequestBody MyPageParam pageParam) {
         if (pageParam != null) {
             PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
         }

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/controller/FlowMessageController.java

@@ -2,7 +2,6 @@ package com.ankaibei.workFlow.common.flow.controller;
 
 import io.swagger.annotations.Api;
 import com.alibaba.fastjson.JSONObject;
-import com.ankaibei.workFlow.common.core.annotation.MyRequestBody;
 import com.ankaibei.workFlow.common.core.object.*;
 import com.ankaibei.workFlow.common.core.constant.ErrorCodeEnum;
 import com.ankaibei.workFlow.common.core.util.MyPageUtil;
@@ -54,7 +53,7 @@ public class FlowMessageController {
      * @return 应答结果对象，包含查询结果集。
      */
     @PostMapping("/listRemindingTask")
-    public ResponseResult<MyPageData<FlowMessageVo>> listRemindingTask(@MyRequestBody MyPageParam pageParam) {
+    public ResponseResult<MyPageData<FlowMessageVo>> listRemindingTask(@RequestBody MyPageParam pageParam) {
         if (pageParam != null) {
             PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
         }
@@ -72,7 +71,7 @@ public class FlowMessageController {
      */
     @PostMapping("/listCopyMessage")
     public ResponseResult<MyPageData<FlowMessageVo>> listCopyMessage(
-            @MyRequestBody MyPageParam pageParam, @MyRequestBody Boolean read) {
+            @RequestBody MyPageParam pageParam, @RequestBody Boolean read) {
         if (pageParam != null) {
             PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
         }
@@ -87,7 +86,7 @@ public class FlowMessageController {
      * @return 应答结果对象。
      */
     @PostMapping("/readCopyTask")
-    public ResponseResult<Void> readCopyTask(@MyRequestBody Long messageId) {
+    public ResponseResult<Void> readCopyTask(@RequestBody Long messageId) {
         String errorMessage;
         // 验证流程任务的合法性。
         FlowMessage flowMessage = flowMessageService.getById(messageId);

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/controller/FlowOperationController.java

@@ -120,7 +120,7 @@ public class FlowOperationController {
      */
     @OperationLog(type = SysOperationLogType.START_FLOW)
     @PostMapping("/startOnly")
-    public ResponseResult<Void> startOnly(@MyRequestBody(required = true) String processDefinitionKey) {
+    public ResponseResult<Void> startOnly(@RequestBody(required = true) String processDefinitionKey) {
         // 1. 验证流程数据的合法性。
         ResponseResult<FlowEntry> flowEntryResult = flowOperationHelper.verifyAndGetFlowEntry(processDefinitionKey);
         if (!flowEntryResult.isSuccess()) {
@@ -452,10 +452,10 @@ public class FlowOperationController {
      */
     @PostMapping("/submitConsign")
     public ResponseResult<Void> submitConsign(
-            @MyRequestBody(required = true) String processInstanceId,
-            @MyRequestBody(required = true) String taskId,
-            @MyRequestBody(required = true) String newAssignees,
-            @MyRequestBody Boolean isAdd) {
+            @RequestBody(required = true) String processInstanceId,
+            @RequestBody(required = true) String taskId,
+            @RequestBody(required = true) String newAssignees,
+            @RequestBody Boolean isAdd) {
         String errorMessage;
         ResponseResult<JSONObject> verifyResult = this.doVerifyMultiSign(processInstanceId, taskId);
         if (!verifyResult.isSuccess()) {
@@ -515,8 +515,7 @@ public class FlowOperationController {
      */
     @DisableDataFilter
     @PostMapping("/listRuntimeTask")
-    public ResMsg listRuntimeTask(
-            @RequestBody ListRuntimeTaskRequestVo listRuntimeTaskRequestVo) {
+    public ResMsg listRuntimeTask(@RequestBody ListRuntimeTaskRequestVo listRuntimeTaskRequestVo) {
         String username = TokenData.takeFromRequest().getLoginName();
         MyPageData<Task> pageData = flowApiService.getTaskListByUserName(
                 username, listRuntimeTaskRequestVo);
@@ -546,8 +545,7 @@ public class FlowOperationController {
      * @return 指定任务的可回退用户任务列表。
      */
     @GetMapping("/listRejectCandidateUserTask")
-    public ResponseResult<List<FlowTaskVo>> listRejectCandidateUserTask(
-            @RequestParam String processInstanceId, @RequestParam String taskId) {
+    public ResponseResult<List<FlowTaskVo>> listRejectCandidateUserTask(@RequestParam String processInstanceId, @RequestParam String taskId) {
         String errorMessage;
         Task task = flowApiService.getProcessInstanceActiveTask(processInstanceId, taskId);
         if (task == null) {
@@ -578,10 +576,10 @@ public class FlowOperationController {
      */
     @PostMapping("/rejectToStartUserTask")
     public ResponseResult<Void> rejectToStartUserTask(
-            @MyRequestBody(required = true) String processInstanceId,
-            @MyRequestBody(required = true) String taskId,
-            @MyRequestBody(required = true) String taskComment,
-            @MyRequestBody JSONObject taskVariableData) {
+            @RequestBody(required = true) String processInstanceId,
+            @RequestBody(required = true) String taskId,
+            @RequestBody(required = true) String taskComment,
+            @RequestBody JSONObject taskVariableData) {
         String errorMessage;
         ResponseResult<Task> taskResult =
                 flowOperationHelper.verifySubmitAndGetTask(processInstanceId, taskId, null);
@@ -609,11 +607,11 @@ public class FlowOperationController {
      */
     @PostMapping("/rejectRuntimeTask")
     public ResponseResult<Void> rejectRuntimeTask(
-            @MyRequestBody(required = true) String processInstanceId,
-            @MyRequestBody(required = true) String taskId,
-            @MyRequestBody(required = true) String taskComment,
-            @MyRequestBody String targetTaskKey,
-            @MyRequestBody JSONObject taskVariableData) {
+            @RequestBody(required = true) String processInstanceId,
+            @RequestBody(required = true) String taskId,
+            @RequestBody(required = true) String taskComment,
+            @RequestBody String targetTaskKey,
+            @RequestBody JSONObject taskVariableData) {
         String errorMessage;
         ResponseResult<Task> taskResult =
                 flowOperationHelper.verifySubmitAndGetTask(processInstanceId, taskId, null);
@@ -639,10 +637,10 @@ public class FlowOperationController {
      */
     @PostMapping("/revokeHistoricTask")
     public ResponseResult<Void> revokeHistoricTask(
-            @MyRequestBody(required = true) String processInstanceId,
-            @MyRequestBody(required = true) String taskId,
-            @MyRequestBody(required = true) String taskComment,
-            @MyRequestBody JSONObject taskVariableData) {
+            @RequestBody(required = true) String processInstanceId,
+            @RequestBody(required = true) String taskId,
+            @RequestBody(required = true) String taskComment,
+            @RequestBody JSONObject taskVariableData) {
         String errorMessage;
         if (!flowApiService.existActiveProcessInstance(processInstanceId)) {
             errorMessage = "数据验证失败，当前流程实例已经结束，不能执行撤回！";
@@ -835,10 +833,10 @@ public class FlowOperationController {
     @DisableDataFilter
     @PostMapping("/listHistoricTask")
     public ResponseResult<MyPageData<Map<String, Object>>> listHistoricTask(
-            @MyRequestBody String processDefinitionName,
-            @MyRequestBody String beginDate,
-            @MyRequestBody String endDate,
-            @MyRequestBody(required = true) MyPageParam pageParam) throws ParseException {
+            @RequestBody String processDefinitionName,
+            @RequestBody String beginDate,
+            @RequestBody String endDate,
+            @RequestBody(required = true) MyPageParam pageParam) throws ParseException {
         MyPageData<HistoricTaskInstance> pageData =
                 flowApiService.getHistoricTaskInstanceFinishedList(processDefinitionName, beginDate, endDate, pageParam);
         List<Map<String, Object>> resultList = new LinkedList<>();
@@ -889,10 +887,10 @@ public class FlowOperationController {
      */
     @PostMapping("/listHistoricProcessInstance")
     public ResponseResult<MyPageData<Map<String, Object>>> listHistoricProcessInstance(
-            @MyRequestBody String processDefinitionName,
-            @MyRequestBody String beginDate,
-            @MyRequestBody String endDate,
-            @MyRequestBody(required = true) MyPageParam pageParam) throws ParseException {
+            @RequestBody String processDefinitionName,
+            @RequestBody String beginDate,
+            @RequestBody String endDate,
+            @RequestBody(required = true) MyPageParam pageParam) throws ParseException {
         String loginName = TokenData.takeFromRequest().getLoginName();
         MyPageData<HistoricProcessInstance> pageData = flowApiService.getHistoricProcessInstanceList(
                 null, processDefinitionName, loginName, beginDate, endDate, pageParam, true);
@@ -921,11 +919,11 @@ public class FlowOperationController {
      */
     @PostMapping("/listAllHistoricProcessInstance")
     public ResponseResult<MyPageData<Map<String, Object>>> listAllHistoricProcessInstance(
-            @MyRequestBody String processDefinitionName,
-            @MyRequestBody String startUser,
-            @MyRequestBody String beginDate,
-            @MyRequestBody String endDate,
-            @MyRequestBody(required = true) MyPageParam pageParam) throws ParseException {
+            @RequestBody String processDefinitionName,
+            @RequestBody String startUser,
+            @RequestBody String beginDate,
+            @RequestBody String endDate,
+            @RequestBody(required = true) MyPageParam pageParam) throws ParseException {
         MyPageData<HistoricProcessInstance> pageData = flowApiService.getHistoricProcessInstanceList(
                 null, processDefinitionName, startUser, beginDate, endDate, pageParam, false);
         List<Map<String, Object>> resultList = new LinkedList<>();
@@ -972,7 +970,7 @@ public class FlowOperationController {
     @DisableDataFilter
     @OperationLog(type = SysOperationLogType.REMIND_TASK)
     @PostMapping("/remindRuntimeTask")
-    public ResponseResult<Void> remindRuntimeTask(@MyRequestBody(required = true) Long workOrderId) {
+    public ResponseResult<Void> remindRuntimeTask(@RequestBody(required = true) Long workOrderId) {
         FlowWorkOrder flowWorkOrder = flowWorkOrderService.getById(workOrderId);
         if (flowWorkOrder == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
@@ -1007,8 +1005,8 @@ public class FlowOperationController {
     @DisableDataFilter
     @PostMapping("/cancelWorkOrder")
     public ResponseResult<Void> cancelWorkOrder(
-            @MyRequestBody(required = true) Long workOrderId,
-            @MyRequestBody(required = true) String cancelReason) {
+            @RequestBody(required = true) Long workOrderId,
+            @RequestBody(required = true) String cancelReason) {
         FlowWorkOrder flowWorkOrder = flowWorkOrderService.getById(workOrderId);
         if (flowWorkOrder == null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
@@ -1051,11 +1049,11 @@ public class FlowOperationController {
     @DisableDataFilter
     @PostMapping("/interveneRuntimeTask")
     public ResponseResult<Void> interveneRuntimeTask(
-            @MyRequestBody(required = true) String processInstanceId,
-            @MyRequestBody(required = true) String taskId,
-            @MyRequestBody(required = true) String taskComment,
-            @MyRequestBody String targetTaskKey,
-            @MyRequestBody String delegateAssignee) {
+            @RequestBody(required = true) String processInstanceId,
+            @RequestBody(required = true) String taskId,
+            @RequestBody(required = true) String taskComment,
+            @RequestBody String targetTaskKey,
+            @RequestBody String delegateAssignee) {
         String errorMessage;
         Task task = flowApiService.getProcessInstanceActiveTask(processInstanceId, taskId);
         if (task == null) {
@@ -1098,8 +1096,8 @@ public class FlowOperationController {
     @DisableDataFilter
     @PostMapping("/stopProcessInstance")
     public ResponseResult<Void> stopProcessInstance(
-            @MyRequestBody(required = true) String processInstanceId,
-            @MyRequestBody(required = true) String stopReason) {
+            @RequestBody(required = true) String processInstanceId,
+            @RequestBody(required = true) String stopReason) {
         CallResult result = flowApiService.stopProcessInstance(processInstanceId, stopReason, false);
         if (!result.isSuccess()) {
             return ResponseResult.errorFrom(result);
@@ -1115,7 +1113,7 @@ public class FlowOperationController {
      */
     @OperationLog(type = SysOperationLogType.DELETE_FLOW)
     @PostMapping("/deleteProcessInstance")
-    public ResponseResult<Void> deleteProcessInstance(@MyRequestBody(required = true) String processInstanceId) {
+    public ResponseResult<Void> deleteProcessInstance(@RequestBody(required = true) String processInstanceId) {
         flowApiService.deleteProcessInstance(processInstanceId);
         return ResponseResult.success();
     }