From 960de47fb15e7730ee3ac3385534cc0754096a14 Mon Sep 17 00:00:00 2001 From: lvleigang <957075182@qq.com> Date: Tue, 15 Apr 2025 14:09:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ZjMaterielSynchronizationEventEntity.xml | 2 +- .../impl/ZjMaterielSynchronizationEventServiceImpl.java | 2 +- .../src/test/java/com/hzya/frame/temButtom.java | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.xml index cc1824b3..72c974c2 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.xml @@ -69,7 +69,7 @@ '1314047672872420014', -- field0040 '6435913155541223805', -- field0042 '7788441092115810835', -- field0047 - '-7568576445236623045' -- field0048 + '-7568576445236623045', -- field0048 '-6211401909916515167' -- field0049 ) diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/service/impl/ZjMaterielSynchronizationEventServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/service/impl/ZjMaterielSynchronizationEventServiceImpl.java index cf651222..5ebab237 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/service/impl/ZjMaterielSynchronizationEventServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/service/impl/ZjMaterielSynchronizationEventServiceImpl.java @@ -551,7 +551,7 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService list, boolean flag,List inventoryEntities) { // 定义正则表达式，匹配全角符号 - String regex = "[\uFF00-\uFFEF]"; + String regex = "[\uFF00-\uFFEF&&[^～Φφμ/±%^Ω≥≤#]]"; // 编译正则表达式 Pattern pattern = Pattern.compile(regex); Integer num = 0; diff --git a/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java b/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java index b60e93e6..aac7e4f0 100644 --- a/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java +++ b/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.plugin.zjmaterielsynchronizationevent.service.IZjMaterielSynchronizationEventService; import com.hzya.frame.util.AESUtil; +import com.hzya.frame.web.entity.BaseResult; import org.apache.http.HttpEntity; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; @@ -27,6 +28,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.regex.Pattern; /** * @ClassName dsasas @@ -40,6 +42,13 @@ public class temButtom { @Test public void test01() { + String regex = "[\uFF00-\uFF5D\uFF5F-\uFFEF]"; + // 编译正则表达式 + Pattern pattern = Pattern.compile(regex); + if(pattern.matcher("测试-32位,RL78,128KB,12KB,1.6-5.5V,-40 ～85°C,民用,LQFP-80;R5F100MGAFA(瑞萨)").find()){ + System.out.println("1231231"); + + } String a = AESUtil.encrypt("hzya1314"); System.out.println(a); String b = AESUtil.decrypt("62e4295b615a30dbf3b8ee96f41c820b");