fix:入场人禁用编辑、删除;

liquidnet-bus-common/liquidnet-common-exception/liquidnet-common-exception-base/src/main/java/com/liquidnet/common/exception/entity/Error.java

@@ -2,18 +2,14 @@ package com.liquidnet.common.exception.entity;
 
 import lombok.Data;
 
-import java.util.List;
+import java.io.Serializable;
 
-/**
- * Created by shangshengfang on 2017/2/16.
- */
 @Data
-public class Error {
+public class Error implements Serializable, Cloneable {
     String message;
     String code;
     Object data;
 
-
     public Error() {
     }
 
@@ -21,4 +17,30 @@ public class Error {
         this.code = code;
         this.message = message;
     }
+
+    public Error setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    public Error setCode(String code) {
+        this.code = code;
+        return this;
+    }
+
+    public Error setData(Object data) {
+        this.data = data;
+        return this;
+    }
+
+    private static final Error obj = new Error();
+
+    public static Error getNew() {
+        try {
+            return (Error) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new Error();
+        }
+    }
+
 }

liquidnet-bus-common/liquidnet-common-exception/liquidnet-common-exception-handler-service/src/main/java/com/liquidnet/common/exception/RestControllerAdviceHandler.java

@@ -11,6 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.validation.FieldError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.MissingServletRequestParameterException;
@@ -42,10 +43,13 @@ public class RestControllerAdviceHandler {
         logger.error("Ex.Handler.RestController:uri:{},param:{},ex:{},msg:{},",
                 req.getRequestURI(), JSON.toJSONString(req.getParameterMap()), rex.getClass().getSimpleName(), rex.getLocalizedMessage());
 
+        if (rex instanceof HttpMessageNotReadableException) {
+            return new ResponseEntity<>(Error.getNew().setCode(ErrorCode.HTTP_PARAM_ERROR.getCode()).setMessage(ErrorCode.HTTP_PARAM_ERROR.getMessage()), HttpStatus.OK);
+        }
         if (rex instanceof MissingServletRequestParameterException) {
             MissingServletRequestParameterException ygex = (MissingServletRequestParameterException) rex;
             String message = ygex.getMessage();
-            return new ResponseEntity<Error>(new Error(ErrorCode.HTTP_PARAM_ERROR.getCode(), message), HttpStatus.OK);
+            return new ResponseEntity<>(Error.getNew().setCode(ErrorCode.HTTP_PARAM_ERROR.getCode()).setMessage(message), HttpStatus.OK);
         }
         if (rex instanceof ConstraintViolationException) {
             ConstraintViolationException ygex = (ConstraintViolationException) rex;
@@ -53,27 +57,27 @@ public class RestControllerAdviceHandler {
             String violationNode = violation.getPropertyPath().toString();
 //            String message = violationNode.substring(violationNode.indexOf(".") + 1) + violation.getMessage();
             String message = violation.getMessage();
-            return new ResponseEntity<Error>(new Error(ErrorCode.HTTP_PARAM_ERROR.getCode(), message), HttpStatus.OK);
+            return new ResponseEntity<>(Error.getNew().setCode(ErrorCode.HTTP_PARAM_ERROR.getCode()).setMessage(message), HttpStatus.OK);
         }
         if (rex instanceof MethodArgumentNotValidException) {
             MethodArgumentNotValidException ygex = (MethodArgumentNotValidException) rex;
             FieldError fieldError = ygex.getBindingResult().getFieldErrors().get(0);
 //            String message = fieldError.getField() + " " + fieldError.getDefaultMessage();
             String message = fieldError.getDefaultMessage();
-            return new ResponseEntity<Error>(new Error(ErrorCode.HTTP_PARAM_ERROR.getCode(), message), HttpStatus.OK);
+            return new ResponseEntity<>(Error.getNew().setCode(ErrorCode.HTTP_PARAM_ERROR.getCode()).setMessage(message), HttpStatus.OK);
         }
         if (rex instanceof LiquidnetFeignException) {
             LiquidnetFeignException ygex = (LiquidnetFeignException) rex;
             String errorCode = ygex.errorCode().getCode();
             String message = ygex.getMessage();
             message = message == null ? ygex.errorCode().getMessage() : message;
-            return new ResponseEntity<Error>(new Error(errorCode, message), HttpStatus.OK);
+            return new ResponseEntity<>(Error.getNew().setCode(errorCode).setMessage(message), HttpStatus.OK);
         }
         if (rex instanceof LiquidnetServiceException) {
             LiquidnetServiceException ygex = (LiquidnetServiceException) rex;
             String errorCode = ygex.getCode();
             String message = ygex.getMessage();
-            return new ResponseEntity<Error>(new Error(errorCode, message), HttpStatus.OK);
+            return new ResponseEntity<>(Error.getNew().setCode(errorCode).setMessage(message), HttpStatus.OK);
         } else {
             logger.error("Unprocessed exception", rex);
 //            return new ResponseEntity<Error>(new Error(ErrorCode.HTTP_SYSTEM_ERROR.getCode(), ErrorCode.HTTP_SYSTEM_ERROR.getMessage()), HttpStatus.OK);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamEntersController.java

@@ -51,8 +51,8 @@ public class AdamEntersController {
 
     @Value("${liquidnet.reviewer.limit.enters:10}")
     private int reviewLimitEnters;
-    @Value("${liquidnet.reviewer.limit.enters_opr:10}")
-    private int reviewLimitEntersOpr;
+//    @Value("${liquidnet.reviewer.limit.enters_opr:10}")
+//    private int reviewLimitEntersOpr;
 
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "添加入场人")
@@ -106,18 +106,18 @@ public class AdamEntersController {
             }
         }
 
-        int userEntersOprNo = adamRdmService.getUserEntersOprNo(currentUid);
-        if (reviewLimitEntersOpr > 0 && userEntersOprNo >= reviewLimitEntersOpr) {
-            return ResponseDto.failure(ErrorMapping.get("10026"));
-        }
+//        int userEntersOprNo = adamRdmService.getUserEntersOprNo(currentUid);
+//        if (reviewLimitEntersOpr > 0 && userEntersOprNo >= reviewLimitEntersOpr) {
+//            return ResponseDto.failure(ErrorMapping.get("10026"));
+//        }
 
         String entersId = adamEntersService.add(parameter, currentUid, vos);
 
-        if (userEntersOprNo == -1) {
-            adamRdmService.setUserEntersOprNo(currentUid);
-        } else {
-            adamRdmService.incrUserEntersOprNo(currentUid);
-        }
+//        if (userEntersOprNo == -1) {
+//            adamRdmService.setUserEntersOprNo(currentUid);
+//        } else {
+//            adamRdmService.incrUserEntersOprNo(currentUid);
+//        }
         return ResponseDto.success(entersId);
     }
 
@@ -171,18 +171,18 @@ public class AdamEntersController {
             return ResponseDto.failure(ErrorMapping.get("10105"));
         }
 
-        int userEntersOprNo = adamRdmService.getUserEntersOprNo(currentUid);
-        if (reviewLimitEntersOpr > 0 && userEntersOprNo >= reviewLimitEntersOpr) {
-            return ResponseDto.failure(ErrorMapping.get("10026"));
-        }
-
-        adamEntersService.edit(parameter);
-
-        if (userEntersOprNo == -1) {
-            adamRdmService.setUserEntersOprNo(currentUid);
-        } else {
-            adamRdmService.incrUserEntersOprNo(currentUid);
-        }
+////        int userEntersOprNo = adamRdmService.getUserEntersOprNo(currentUid);
+////        if (reviewLimitEntersOpr > 0 && userEntersOprNo >= reviewLimitEntersOpr) {
+////            return ResponseDto.failure(ErrorMapping.get("10026"));
+////        }
+////
+//        adamEntersService.edit(parameter);
+////
+////        if (userEntersOprNo == -1) {
+////            adamRdmService.setUserEntersOprNo(currentUid);
+////        } else {
+////            adamRdmService.incrUserEntersOprNo(currentUid);
+////        }
         return ResponseDto.success();
     }
 
@@ -195,7 +195,7 @@ public class AdamEntersController {
         AdamEntersVo enters = adamRdmService.getEntersVoByUidEntersId(currentUid, entersId);
         if (null == enters) return ResponseDto.failure(ErrorMapping.get("10105"));
 
-        adamEntersService.remove(currentUid, entersId);
+//        adamEntersService.remove(currentUid, entersId);
 
         return ResponseDto.success();
     }