企业端-二维码管理-新二维码修改

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java

@@ -314,8 +314,9 @@ public class AppEnterpriseInformationController extends BaseController
     @ResponseBody
     public ZDResponse addQrCode(@PathVariable("num") String num)
     {
-        return enterpriseInformationService.insertQrCode(num) > 0 ?
+        int i=enterpriseInformationService.insertQrCode(num);
-                ZDResponse.success("失效成功"): ZDResponse.error("失效失败");
+        return i > 0 ?
+                ZDResponse.success("失效成功",i): ZDResponse.error("失效失败",i);
     }
     /**
      * 通过市监二维码获取企业信息

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java

@@ -9,10 +9,7 @@ import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.bean.BeanUtil;
@@ -448,6 +445,9 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
 
     @Override
     public int insertQrCode(String num) {
+        Date current=new Date();
+        QrCodeGenerateHistory qr=iQrCodeGenerateHistoryService.selectQrCodeGenerateHistoryByNewest(num);
+        if(current.getTime()-qr.getGenerateTime().getTime()>86400000L) {
             // 先将与之关联的其他二维码都失效
             QrCodeGenerateHistory qrParams = new QrCodeGenerateHistory();
             qrParams.setEnterpriseNumber(num);
@@ -490,6 +490,9 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
                 }
             }
             return 0;
+        }else{
+            return 3;
+        }
     }
 
     @Override