From 51fe4ba86ecbd34d48cf3cc64e49af7fb855ed6e Mon Sep 17 00:00:00 2001 From: zouyx <1798599149@qq.com> Date: Tue, 3 Dec 2024 11:15:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF-=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E7=AE=A1=E7=90=86-=E6=96=B0=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnterpriseInformationController.java | 5 +- .../EnterpriseInformationServiceImpl.java | 89 ++++++++++--------- 2 files changed, 49 insertions(+), 45 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 93969b12..bf0dd4c7 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 @@ -314,8 +314,9 @@ 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); + return i > 0 ? + ZDResponse.success("失效成功",i): ZDResponse.error("失效失败",i); } /** * 通过市监二维码获取企业信息 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 2f1f5bf5..a8b191c1 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 @@ -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.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import cn.hutool.core.bean.BeanUtil; @@ -448,48 +445,54 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS @Override public int insertQrCode(String num) { - // 先将与之关联的其他二维码都失效 - QrCodeGenerateHistory qrParams = new QrCodeGenerateHistory(); - qrParams.setEnterpriseNumber(num); - qrParams.setStatus(1); - iQrCodeGenerateHistoryService.updateQrCodeGenerateHistoryByNumber(qrParams); - - // 通过 企业编码 获取该编码在数据库中的企业信息, 将salt拿出来做生成参数 - EnterpriseInformation info = new EnterpriseInformation(); - info.setEnterpriseNumber(num); - List enterpriseInformations = enterpriseInformationMapper.selectEnterpriseInformationList(info); - if (null != enterpriseInformations && enterpriseInformations.size() > 0) { - EnterpriseInformation enterpriseInformation = enterpriseInformations.get(0); + Date current=new Date(); + QrCodeGenerateHistory qr=iQrCodeGenerateHistoryService.selectQrCodeGenerateHistoryByNewest(num); + if(current.getTime()-qr.getGenerateTime().getTime()>86400000L) { + // 先将与之关联的其他二维码都失效 + QrCodeGenerateHistory qrParams = new QrCodeGenerateHistory(); + qrParams.setEnterpriseNumber(num); + qrParams.setStatus(1); + iQrCodeGenerateHistoryService.updateQrCodeGenerateHistoryByNumber(qrParams); + + // 通过 企业编码 获取该编码在数据库中的企业信息, 将salt拿出来做生成参数 + EnterpriseInformation info = new EnterpriseInformation(); + info.setEnterpriseNumber(num); + List enterpriseInformations = enterpriseInformationMapper.selectEnterpriseInformationList(info); + if (null != enterpriseInformations && enterpriseInformations.size() > 0) { + EnterpriseInformation enterpriseInformation = enterpriseInformations.get(0); // String text = enterpriseInformation.getSalt(); - String uuid = IdUtil.simpleUUID(); - Map jsonMap = new HashMap<>(); - jsonMap.put("salt", enterpriseInformation.getSalt()); - jsonMap.put("codeId", uuid); - jsonMap.put("type", "zfjd"); - String text = JSON.toJSONString(jsonMap); - //这里设置自定义网站url - String logoPath = qrCodeUrl; - try { - File encode = QRCodeUtil.encodeFile(text, logoPath, filePath, true); - MultipartFile multipartFile = QRCodeUtil.getMultipartFile(encode); - String upload = fileUploadApi.upload(multipartFile); - - QrCodeGenerateHistory qrCodeGenerateHistory = new QrCodeGenerateHistory(); - qrCodeGenerateHistory.setId(uuid); - //生成时间 - qrCodeGenerateHistory.setGenerateTime(DateUtils.getNowDate()); - //二维码地址 - qrCodeGenerateHistory.setQrCodeUrl(upload); - //统一信用代码 - qrCodeGenerateHistory.setEnterpriseNumber(enterpriseInformation.getEnterpriseNumber()); - //变更原因 - qrCodeGenerateHistory.setReasonsChange("登记"); - return iQrCodeGenerateHistoryService.insertQrCodeGenerateHistory(qrCodeGenerateHistory); - } catch (Exception e) { - e.printStackTrace(); + String uuid = IdUtil.simpleUUID(); + Map jsonMap = new HashMap<>(); + jsonMap.put("salt", enterpriseInformation.getSalt()); + jsonMap.put("codeId", uuid); + jsonMap.put("type", "zfjd"); + String text = JSON.toJSONString(jsonMap); + //这里设置自定义网站url + String logoPath = qrCodeUrl; + try { + File encode = QRCodeUtil.encodeFile(text, logoPath, filePath, true); + MultipartFile multipartFile = QRCodeUtil.getMultipartFile(encode); + String upload = fileUploadApi.upload(multipartFile); + + QrCodeGenerateHistory qrCodeGenerateHistory = new QrCodeGenerateHistory(); + qrCodeGenerateHistory.setId(uuid); + //生成时间 + qrCodeGenerateHistory.setGenerateTime(DateUtils.getNowDate()); + //二维码地址 + qrCodeGenerateHistory.setQrCodeUrl(upload); + //统一信用代码 + qrCodeGenerateHistory.setEnterpriseNumber(enterpriseInformation.getEnterpriseNumber()); + //变更原因 + qrCodeGenerateHistory.setReasonsChange("登记"); + return iQrCodeGenerateHistoryService.insertQrCodeGenerateHistory(qrCodeGenerateHistory); + } catch (Exception e) { + e.printStackTrace(); + } } + return 0; + }else{ + return 3; } - return 0; } @Override