NotRepeat(update)

src/main/java/com/mmc/oms/controller/demand/commit/NotRepeatSubmitConfig.java

@@ -74,7 +74,25 @@ public class NotRepeatSubmitConfig extends BaseController {
         HttpServletRequest request = attributes.getRequest();
         Integer userAccountId = this.getCurrentAccount(request).getUserAccountId();
 
-        String accountUriLockKey = userAccountId + "-" + request.getServletPath();
+        Map<String, Object> map = new HashMap<String, Object>();
+        Object[] values = proceedingJoinPoint.getArgs();
+        String[] names = ((CodeSignature) proceedingJoinPoint.getSignature()).getParameterNames();
+        for (int i = 0; i < names.length; i++) {
+            map.put(names[i], values[i]);
+        }
+        log.info(map+"");
+        CommonPaymentVO commonPaymentsVO = (CommonPaymentVO) map.get("commonPaymentVO");
+        String json1 = stringRedisTemplate.opsForValue().get(commonPaymentsVO.getOrderNumber());
+        GetOrderNumberDTO getOrderNumberDTO1= JSONObject.parseObject(json1, GetOrderNumberDTO.class);
+        Integer requirementsInfoId = getOrderNumberDTO1.getRequirementsInfoId();
+        String accountUriLockKey=null;
+        if (requirementsInfoId!=null){
+           accountUriLockKey = requirementsInfoId + "-" + request.getServletPath();
+        }else {
+           accountUriLockKey = userAccountId + "-" + request.getServletPath();
+        }
+
+
         // 设置锁定资源名称，accountUriLock改为userid+uri作为标识，作为测试写死
         //   String accountUriLockKey = "accountUriLock";
 
@@ -86,14 +104,6 @@ public class NotRepeatSubmitConfig extends BaseController {
         String name = method.getDeclaringClass().getName();
         String[] parameterNames = signature.getParameterNames();
 
-        Map<String, Object> map = new HashMap<String, Object>();
-        Object[] values = proceedingJoinPoint.getArgs();
-        String[] names = ((CodeSignature) proceedingJoinPoint.getSignature()).getParameterNames();
-        for (int i = 0; i < names.length; i++) {
-            map.put(names[i], values[i]);
-        }
-        log.info(map+"");
-        CommonPaymentVO commonPaymentsVO = (CommonPaymentVO) map.get("commonPaymentVO");
 
         //尝试获取分布式锁
         //-1为永久  leaseTime 最多等待几秒   上锁以后leaseTime秒自动解锁