From af2a0456c0d4672e628c5fdfc4b5039d66dc21ca Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 11:12:18 +0800
Subject: [PATCH] 保安员证编号校验规则修改
---
src/main/java/org/springblade/modules/securitypaper/mapper/SecurityPaperMapper.java | 8 ++++++++
src/main/java/org/springblade/modules/securitypaper/service/SecurityPaperService.java | 1 +
src/main/java/org/springblade/common/utils/DesensitizedUtil.java | 28 +++++++++++++++++++++-------
src/main/java/org/springblade/modules/FTP/DataHanlder.java | 9 +++++++++
4 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/common/utils/DesensitizedUtil.java b/src/main/java/org/springblade/common/utils/DesensitizedUtil.java
index a750bba..d23febd 100644
--- a/src/main/java/org/springblade/common/utils/DesensitizedUtil.java
+++ b/src/main/java/org/springblade/common/utils/DesensitizedUtil.java
@@ -2,6 +2,7 @@
import com.google.common.base.Strings;
import org.apache.commons.lang3.StringUtils;
+import org.springblade.modules.FTP.Result;
import java.util.HashMap;
import java.util.Map;
@@ -110,15 +111,28 @@
}
public static void main(String[] args) {
- desensitizedIdNumberBy4("360728199205280059");
+// desensitizedIdNumberBy4("360728199205280059");
desensitizedSecurityNumber("赣洪202100124");
+ String s = "赣洪202222124";
- Map<String, Object> map = new HashMap<>(1);
- String a = "sdafa-445sdaf-fsafdsaf";
- map.put(a,"abc");
- System.out.println("map = " + map.keySet());
- Object o = map.get(a);
- System.out.println("o = " + o);
+ int min = 22110;
+ int max = 23110;
+ //截取，这个范围的不校验
+ String pre = s.substring(0,6);
+ String number = s.substring(6);
+ if (pre.equals("赣洪2022")){
+ int num = Integer.parseInt(number);
+ if (num>=22110 && num<=max){
+ System.out.println("符合要求" + num);
+ }
+ }
+
+// Map<String, Object> map = new HashMap<>(1);
+// String a = "sdafa-445sdaf-fsafdsaf";
+// map.put(a,"abc");
+// System.out.println("map = " + map.keySet());
+// Object o = map.get(a);
+// System.out.println("o = " + o);
}
diff --git a/src/main/java/org/springblade/modules/FTP/DataHanlder.java b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
index a3c6fa5..4040773 100644
--- a/src/main/java/org/springblade/modules/FTP/DataHanlder.java
+++ b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
@@ -784,6 +784,15 @@
&& user.getHold().equals("1")
&& null!=user.getSecuritynumber()
&& !user.getSecuritynumber().equals("")){
+ //截取，这个范围的不校验
+ String pre = user.getSecuritynumber().substring(0,6);
+ String number = user.getSecuritynumber().substring(6);
+ if (pre.equals("赣洪2022")){
+ int num = Integer.parseInt(number);
+ if (num>=22110 && num<=23110){
+ return new Result(200,null,"",user);
+ }
+ }
//持证，校验保安证编号是否合法
SecurityPaper securityPaper = new SecurityPaper();
securityPaper.setIdCardNo(user.getCardid());
diff --git a/src/main/java/org/springblade/modules/securitypaper/mapper/SecurityPaperMapper.java b/src/main/java/org/springblade/modules/securitypaper/mapper/SecurityPaperMapper.java
index 2a59682..4015608 100644
--- a/src/main/java/org/springblade/modules/securitypaper/mapper/SecurityPaperMapper.java
+++ b/src/main/java/org/springblade/modules/securitypaper/mapper/SecurityPaperMapper.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springblade.modules.securitypaper.entity.SecurityPaper;
+import java.util.List;
+
/**
* 保安员证管理Mapper 接口
@@ -10,4 +12,10 @@
*/
public interface SecurityPaperMapper extends BaseMapper<SecurityPaper> {
+ /**
+ * 查询保安员证编号（跳过一些位数）
+ * @param securityPaper
+ * @return
+ */
+ List<SecurityPaper> getSecurityNumber(SecurityPaper securityPaper);
}
diff --git a/src/main/java/org/springblade/modules/securitypaper/service/SecurityPaperService.java b/src/main/java/org/springblade/modules/securitypaper/service/SecurityPaperService.java
index dee9422..156e066 100644
--- a/src/main/java/org/springblade/modules/securitypaper/service/SecurityPaperService.java
+++ b/src/main/java/org/springblade/modules/securitypaper/service/SecurityPaperService.java
@@ -1,6 +1,7 @@
package org.springblade.modules.securitypaper.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.securitypaper.entity.SecurityPaper;
import org.springblade.modules.securitypaper.excel.SecurityPaperExcel;
--
Gitblit v1.9.3