From a613669ee21be44e9ed4ddd4593e69a0dfe7e5fe Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Thu, 28 Nov 2024 11:13:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=94=9F=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppEnterpriseInformationController.java   |  7 +++++--
 .../resources/templates/system/user/edit.html |  2 +-
 .../EnterpriseInformationServiceImpl.java     | 20 ++++++++++++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java
index 148112f9..4b63e4d8 100644
--- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java
+++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java
@@ -272,7 +272,10 @@ public class AppEnterpriseInformationController extends BaseController
     @ResponseBody
     public ZDResponse addQrCode(@PathVariable("num") String num)
     {
-        return enterpriseInformationService.insertQrCode(num) > 0 ?
-                ZDResponse.success("失效成功"): ZDResponse.error("失效失败");
+        int i = enterpriseInformationService.insertQrCode(num);
+        if(i == 3){
+            return  ZDResponse.success("二维码生成时效不足24小时");
+        }
+        return i > 0 ? ZDResponse.success("失效成功"): ZDResponse.error("失效失败");
     }
 }
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/edit.html
index 0b2dcd9c..378caff0 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/edit.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/edit.html
@@ -36,7 +36,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">手机号码：</label>
                         <div class="col-sm-8">
-                            <input name="phonenumber" placeholder="请输入手机号码" class="form-control" type="text" maxlength="11" th:field="*{phonenumber}" required>
+                            <input name="phonenumber" placeholder="请输入手机号码" class="form-control" type="text" maxlength="50" th:field="*{phonenumber}" required>
                         </div>
                     </div>
                 </div>
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
index 2e9714bf..4fbc1930 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
@@ -352,6 +352,25 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
 
     @Override
     public int insertQrCode(String num) {
+
+        //查询最新的二维码数据
+        QrCodeGenerateHistory qrCodeGenerateHistory1 =
+                iQrCodeGenerateHistoryService.selectQrCodeGenerateHistoryByNewest(num);
+        //判断二维码生成时间
+        Instant instant = qrCodeGenerateHistory1.getGenerateTime().toInstant();
+        ZoneId zoneId = ZoneId.systemDefault();
+        // atZone()方法返回在指定时区从此Instant生成的ZonedDateTime。
+        LocalDateTime date1 = instant.atZone(zoneId).toLocalDateTime();
+        //当前时间
+        LocalDateTime date2 = LocalDateTime.now();
+        //判断相差多少个小时
+        long hoursDiff = ChronoUnit.HOURS.between(date1, date2);
+
+        if(hoursDiff < 24){
+            log.error("二维码生成时间不足24小时");
+            return 3;
+        }
+
         // 先将与之关联的其他二维码都失效
         QrCodeGenerateHistory qrParams = new QrCodeGenerateHistory();
         qrParams.setEnterpriseNumber(num);
@@ -395,5 +414,4 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
         }
         return 0;
     }
-
 }