From c434ece53b249ae10f20f9fd552d03ca671c5b11 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 11 四月 2024 17:08:48 +0800
Subject: [PATCH] 加入电梯相机功能,支持电梯非机动车检车

---
 service-user/src/main/java/com/java110/user/cmd/user/UserSendSmsCmd.java |   76 +++++++++++++++++++------------------
 1 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/cmd/user/UserSendSmsCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/UserSendSmsCmd.java
index 619536c..e6734b6 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/UserSendSmsCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/UserSendSmsCmd.java
@@ -19,6 +19,7 @@
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.StringUtil;
 import com.java110.utils.util.ValidatorUtil;
+import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -52,30 +53,6 @@
             throw new IllegalArgumentException("鎵嬫満鍙锋牸寮忛敊璇�");
         }
 
-        String requestId = DistributedLock.getLockUUID();
-        String key = this.getClass().getSimpleName() + reqJson.getString("tel");
-        try {
-            DistributedLock.waitGetDistributedLock(key, requestId);
-            //鏍¢獙鏄惁鏈夋湁鏁堢殑楠岃瘉鐮�
-            String smsCode = CommonCache.getValue(reqJson.getString("tel") + SendSmsFactory.VALIDATE_CODE);
-
-            if (!StringUtil.isEmpty(smsCode) && smsCode.contains("-")) {
-                long oldTime = Long.parseLong(smsCode.substring(smsCode.indexOf("-") + 1, smsCode.length()));
-                long nowTime = new Date().getTime();
-                if (nowTime - oldTime < 1000 * 60 * 2) {
-                    throw new IllegalArgumentException("璇蜂笉瑕侀噸澶嶅彂閫侀獙璇佺爜");
-                }
-            }
-        } finally {
-            //娓呯悊浜嬪姟淇℃伅
-            DistributedLock.releaseDistributedLock(key, requestId);
-        }
-
-    }
-
-    @Override
-    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-        String tel = reqJson.getString("tel");
         String captchaType = reqJson.getString("captchaType");
         if (!StringUtil.isEmpty(captchaType) && "ownerBinding".equals(captchaType)) {
             OwnerDto ownerDto = new OwnerDto();
@@ -95,20 +72,45 @@
             List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
             Assert.listOnlyOne(ownerDtos, "濉啓涓氫富淇℃伅閿欒锛岃纭锛岄鐣欎笟涓诲鍚嶃�佹墜鏈哄彿" + idCardErrorMsg + "淇℃伅鏄惁姝g‘锛�");
         }
-        //鏍¢獙鏄惁浼犱簡 鍒嗛〉淇℃伅
-        String msgCode = SendSmsFactory.generateMessageCode(6);
-        SmsDto smsDto = new SmsDto();
-        smsDto.setTel(tel);
-        smsDto.setCode(msgCode);
-        if ("ON".equals(MappingCache.getValue(MappingConstant.SMS_DOMAIN, SendSmsFactory.SMS_SEND_SWITCH))) {
-            smsDto = smsInnerServiceSMOImpl.send(smsDto);
-        } else {
-            CommonCache.setValue(smsDto.getTel() + SendSmsFactory.VALIDATE_CODE, smsDto.getCode().toLowerCase() + "-" + new Date().getTime(), CommonCache.defaultExpireTime);
-            smsDto.setSuccess(true);
-            smsDto.setMsg("鎮ㄧ殑楠岃瘉鐮佷负" + msgCode);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+
+        String requestId = DistributedLock.getLockUUID();
+        String key = this.getClass().getSimpleName() + reqJson.getString("tel");
+        try {
+            DistributedLock.waitGetDistributedLock(key, requestId);
+            //鏍¢獙鏄惁鏈夋湁鏁堢殑楠岃瘉鐮�
+            String smsCode = CommonCache.getValue(reqJson.getString("tel") + SendSmsFactory.VALIDATE_CODE);
+
+            if (!StringUtil.isEmpty(smsCode) && smsCode.contains("-")) {
+                long oldTime = Long.parseLong(smsCode.substring(smsCode.indexOf("-") + 1, smsCode.length()));
+                long nowTime = new Date().getTime();
+                if (nowTime - oldTime < 1000 * 60 * 2) {
+                    throw new IllegalArgumentException("璇蜂笉瑕侀噸澶嶅彂閫侀獙璇佺爜");
+                }
+            }
+
+            String tel = reqJson.getString("tel");
+            //鏍¢獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+            String msgCode = SendSmsFactory.generateMessageCode(6);
+            SmsDto smsDto = new SmsDto();
+            smsDto.setTel(tel);
+            smsDto.setCode(msgCode);
+            if ("ON".equals(MappingCache.getValue(MappingConstant.SMS_DOMAIN, SendSmsFactory.SMS_SEND_SWITCH))) {
+                smsDto = smsInnerServiceSMOImpl.send(smsDto);
+            } else {
+                CommonCache.setValue(smsDto.getTel() + SendSmsFactory.VALIDATE_CODE, smsDto.getCode().toLowerCase() + "-" + new Date().getTime(), CommonCache.defaultExpireTime);
+                smsDto.setSuccess(true);
+                smsDto.setMsg("鎮ㄧ殑楠岃瘉鐮佷负" + msgCode);
+            }
+
+            context.setResponseEntity(ResultVo.createResponseEntity(smsDto.getMsg()));
+        } finally {
+            //娓呯悊浜嬪姟淇℃伅
+            DistributedLock.releaseDistributedLock(key, requestId);
         }
-        ResponseEntity<String> sendMessageResult = new ResponseEntity<String>(smsDto.getMsg(), smsDto.isSuccess() ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
-        context.setResponseEntity(sendMessageResult);
 
     }
 }

--
Gitblit v1.8.0