From 9677266fad8cad3ffbd260714cc78816b34259cc Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 15 Mar 2024 10:46:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20ossFile=E8=A1=A8=E5=92=8Cminio=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9C=89=E6=95=88=E6=80=A7=E6=A3=80=E6=B5=8B=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/LoginServiceImpl.java | 18 +++++------ .../controller/OldSystemController.java | 8 +++++ .../oldSystem/entity/OldSystemImportDTO.java | 4 +++ .../oldSystem/service/OldSystemService.java | 6 ++++ .../service/impl/OldSystemServiceImpl.java | 30 +++++++++++++++++++ 5 files changed, 57 insertions(+), 9 deletions(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java index d50c53d0..efab9e0a 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java @@ -113,8 +113,8 @@ public class LoginServiceImpl implements ILoginService { //redisUtil.del(realKey); try { //解密获取密码和用户名 -// password = CommonUtils.decryptBtRsaPriKey(password, rsaPrivateKey); - username = "admin"; + password = CommonUtils.decryptBtRsaPriKey(password, rsaPrivateKey); + username = CommonUtils.decryptBtRsaPriKey(username, rsaPrivateKey); } catch (Exception e) { e.printStackTrace(); } @@ -141,13 +141,13 @@ public class LoginServiceImpl implements ILoginService { //2. 校验用户名或密码是否正确 String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt()); String syspassword = sysUser.getPassword(); -// if (!syspassword.equals(userpassword)) { -// // 重试登录次数加一 -// retryCount++; -// this.setRetryInfoToRedis(username, retryCount); -// String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请稍后重试":"用户名或密码错误，剩余可登录次数:"+(RETRY_LOGIN_MAX_COUNT - retryCount); -// return Result.error(msg); -// } + if (!syspassword.equals(userpassword)) { + // 重试登录次数加一 + retryCount++; + this.setRetryInfoToRedis(username, retryCount); + String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请稍后重试":"用户名或密码错误，剩余可登录次数:"+(RETRY_LOGIN_MAX_COUNT - retryCount); + return Result.error(msg); + } //登录成功，清除错误登录次数 redisUtil.del(RETRY_LOGIN_PREFIX + username); if (checkSysPermission(username)) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/controller/OldSystemController.java b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/controller/OldSystemController.java index 467d307e..160b0602 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/controller/OldSystemController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/controller/OldSystemController.java @@ -192,4 +192,12 @@ public class OldSystemController { return Result.OK(oldSystemDeptRelationService.esAuthDeptDataFix()); } + @GetMapping("/dataFileFix") + @AutoLog(value = "老法规系统-上线后检测ossFile表中的数据和minio中的数据是否一致/找到minio中不存在的数据") + @ApiOperation(value="老法规系统-上线后检测ossFile表中的数据和minio中的数据是否一致/找到minio中不存在的数据", notes="老法规系统-上线后检测ossFile表中的数据和minio中的数据是否一致/找到minio中不存在的数据") + @ApiOperationSupport(order = 15) + public void dataFileFix(HttpServletResponse response) { + oldSystemService.dataFileFix(response); + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/entity/OldSystemImportDTO.java b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/entity/OldSystemImportDTO.java index 14237a3a..edf1b004 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/entity/OldSystemImportDTO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/entity/OldSystemImportDTO.java @@ -176,6 +176,10 @@ public class OldSystemImportDTO { @TableField(exist = false) private String errorInfo; + @Excel(name = "OssFileID", width = 15, orderNum = "53") + @TableField(exist = false) + private String ossFileId; + /** * 判断是否是空行 * @return 如果所有字段都为null或空字符串，返回true，否则返回false diff --git a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/OldSystemService.java b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/OldSystemService.java index 60b999fc..e4e986fa 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/OldSystemService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/OldSystemService.java @@ -113,4 +113,10 @@ public interface OldSystemService { * @param response */ void importOldSystemFileFixDocPath(MultipartFile file, String type, HttpServletResponse response); + + /** + * 上线后检测ossFile表中的数据和minio中的数据是否一致/找到minio中不存在的数据 + * @param response + */ + void dataFileFix(HttpServletResponse response); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java index 118b4838..1dbd786a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/service/impl/OldSystemServiceImpl.java @@ -419,6 +419,36 @@ public class OldSystemServiceImpl implements OldSystemService { } } + @Override + public void dataFileFix(HttpServletResponse response) { + List errImportList = new ArrayList<>(); + + List ossFileList = ossFileService.list(); + for (OSSFile ossFile : ossFileList) { + String url = ossFile.getUrl(); + if (StrUtil.isBlank(url)) { + OldSystemImportDTO dto = new OldSystemImportDTO(); + dto.setBzh(ossFile.getStandardNo()); + log.error("文件路径为空"); + dto.setErrorInfo("文件路径为空"); + dto.setOssFileId(ossFile.getId()); + errImportList.add(dto); + continue; + } + if (!MinioUtil.doesObjectExist(url)) { + OldSystemImportDTO dto = new OldSystemImportDTO(); + dto.setBzh(ossFile.getStandardNo()); + log.error("文件不存在，路径是：" + url); + dto.setErrorInfo("文件不存在，路径是：" + url); + dto.setOssFileId(ossFile.getId()); + errImportList.add(dto); + } + } + if (!errImportList.isEmpty()) { + this.exportWithExcel(response, errImportList, "OldSystemStandardErrorData.xls"); + } + } + private void oldSysFBDataFileDocPath(List allDatalist, List errImportList) { List fbDatalist = allDatalist.stream().filter(o -> o.getBzfl().contains("ISO") || o.getBzfl().contains("引进") ||