From b2fc2c33c65a026658b2efc48a444c89535d0b49 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 19 Nov 2024 15:38:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6=E9=99=90?= =?UTF-8?q?=E5=88=B6=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/base/basic/config/Constants.java | 10 --- .../impl/TbBdDeviceRecordServiceImpl.java | 32 ++++----- .../service/impl/TbBdRecordServiceImpl.java | 24 +++---- .../impl/TbDevAttributeServiceImpl.java | 10 ++- .../service/impl/TbDeviceServiceImpl.java | 18 ++--- .../service/impl/TbPeopleServiceImpl.java | 8 +-- .../service/impl/TbProDepartServiceImpl.java | 16 ++--- .../service/impl/TbProPowerServiceImpl.java | 8 +-- .../service/impl/TbProjectServiceImpl.java | 16 ++--- .../basic/service/impl/TbTeamServiceImpl.java | 24 +++---- .../service/impl/TbUserPostServiceImpl.java | 16 ++--- .../service/impl/TbWarnConfigServiceImpl.java | 8 +-- .../service/impl/ProjectViewServiceImpl.java | 72 +++++++------------ 13 files changed, 95 insertions(+), 167 deletions(-) diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/config/Constants.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/config/Constants.java index 51f768f..0d3c288 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/config/Constants.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/config/Constants.java @@ -146,14 +146,4 @@ public class Constants { */ public static final String DISALLOWED_REGEX = ".*[!~`@#$%^&*()\\-_,.?\":{}|<>+\\\\/%].*"; - /** - * 百分号 - */ - public static final String PERCENT_SIGN = "%"; - - /** - * 下划线 - */ - public static final String UNDERLINE = "_"; - } diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbBdDeviceRecordServiceImpl.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbBdDeviceRecordServiceImpl.java index 58ae007..69b29a8 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbBdDeviceRecordServiceImpl.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbBdDeviceRecordServiceImpl.java @@ -82,35 +82,27 @@ public class TbBdDeviceRecordServiceImpl implements TbBdDeviceRecordService { @Override public List getDeviceList(TbBdDeviceVo tbBdDeviceVo) { if (tbBdDeviceVo.getProName() != null) { - String proName = tbBdDeviceVo.getProName(); - if (Constants.UNDERLINE.equals(proName)) { - tbBdDeviceVo.setProName(proName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(proName)) { - tbBdDeviceVo.setProName(proName.replace("%", "/%")); + boolean b = tbBdDeviceVo.getProName().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbBdDeviceVo.setProName("/%"); } } if (tbBdDeviceVo.getDepartName() != null) { - String departName = tbBdDeviceVo.getDepartName(); - if (Constants.UNDERLINE.equals(departName)) { - tbBdDeviceVo.setDepartName(departName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(departName)) { - tbBdDeviceVo.setDepartName(departName.replace("%", "/%")); + boolean b = tbBdDeviceVo.getDepartName().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbBdDeviceVo.setDepartName("/%"); } } if (tbBdDeviceVo.getDevName() != null) { - String devName = tbBdDeviceVo.getDevName(); - if (Constants.UNDERLINE.equals(devName)) { - tbBdDeviceVo.setDevName(devName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(devName)) { - tbBdDeviceVo.setDevName(devName.replace("%", "/%")); + boolean b = tbBdDeviceVo.getDevName().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbBdDeviceVo.setDevName("/%"); } } if (tbBdDeviceVo.getDevCode() != null) { - String devCode = tbBdDeviceVo.getDevCode(); - if (Constants.UNDERLINE.equals(devCode)) { - tbBdDeviceVo.setDevCode(devCode.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(devCode)) { - tbBdDeviceVo.setDevCode(devCode.replace("%", "/%")); + boolean b = tbBdDeviceVo.getDevCode().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbBdDeviceVo.setDevCode("/%"); } } List deviceList = tbBdDeviceRecordMapper.getDeviceList(tbBdDeviceVo); diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbBdRecordServiceImpl.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbBdRecordServiceImpl.java index 2b771f0..1342eaf 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbBdRecordServiceImpl.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbBdRecordServiceImpl.java @@ -227,27 +227,21 @@ public class TbBdRecordServiceImpl implements TbBdRecordService { @Override public PageResultVo getAll(TbBdRecord record){ if (record.getDepartName() != null) { - String departName = record.getDepartName(); - if (Constants.UNDERLINE.equals(departName)) { - record.setDepartName(departName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(departName)) { - record.setDepartName(departName.replace("%", "/%")); + boolean b = record.getDepartName().matches(Constants.DISALLOWED_REGEX); + if (b) { + record.setDepartName("/%"); } } if (record.getProName() != null) { - String proName = record.getProName(); - if (Constants.UNDERLINE.equals(proName)) { - record.setProName(proName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(proName)) { - record.setProName(proName.replace("%", "/%")); + boolean b = record.getProName().matches(Constants.DISALLOWED_REGEX); + if (b) { + record.setProName("/%"); } } if (record.getRelUser() != null) { - String relUser = record.getRelUser(); - if (Constants.UNDERLINE.equals(relUser)) { - record.setRelUser(relUser.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(relUser)) { - record.setRelUser(relUser.replace("%", "/%")); + boolean b = record.getRelUser().matches(Constants.DISALLOWED_REGEX); + if (b) { + record.setRelUser("/%"); } } List list; diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbDevAttributeServiceImpl.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbDevAttributeServiceImpl.java index 1a8a203..c7f001a 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbDevAttributeServiceImpl.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbDevAttributeServiceImpl.java @@ -79,12 +79,10 @@ public class TbDevAttributeServiceImpl implements TbDevAttributeService { */ @Override public PageResultVo queryAll(TbDevAttribute record) { - if (record.getDevName() != null) { - String devName = record.getDevName(); - if (Constants.UNDERLINE.equals(devName)) { - record.setDevName(devName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(devName)) { - record.setDevName(devName.replace("%", "/%")); + if (record.getDevName() != null) { + boolean b = record.getDevName().matches(Constants.DISALLOWED_REGEX); + if (b) { + record.setDevName("/%"); } } List list; diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbDeviceServiceImpl.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbDeviceServiceImpl.java index 769747e..1643f34 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbDeviceServiceImpl.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbDeviceServiceImpl.java @@ -134,19 +134,15 @@ public class TbDeviceServiceImpl implements TbDeviceService { @Override public List getAll(TbDevice record) { if (record.getDevName() != null) { - String devName = record.getDevName(); - if (Constants.UNDERLINE.equals(devName)) { - record.setDevName(devName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(devName)) { - record.setDevName(devName.replace("%", "/%")); + boolean b = record.getDevName().matches(Constants.DISALLOWED_REGEX); + if (b) { + record.setDevName("/%"); } } - if (record.getDevCode() != null) { - String devCode = record.getDevCode(); - if (Constants.UNDERLINE.equals(devCode)) { - record.setDevCode(devCode.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(devCode)) { - record.setDevCode(devCode.replace("%", "/%")); + if (record.getDevCode() != null) { + boolean b = record.getDevCode().matches(Constants.DISALLOWED_REGEX); + if (b) { + record.setDevCode("/%"); } } return tbDeviceMapper.getAll(record); diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbPeopleServiceImpl.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbPeopleServiceImpl.java index e2439c6..b0ea4e1 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbPeopleServiceImpl.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbPeopleServiceImpl.java @@ -79,11 +79,9 @@ public class TbPeopleServiceImpl implements TbPeopleService { @Override public List queryByPage(TbPeople tbPeople) { if (tbPeople.getRelName() != null) { - String relName = tbPeople.getRelName(); - if (Constants.UNDERLINE.equals(relName)) { - tbPeople.setRelName(relName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(relName)) { - tbPeople.setRelName(relName.replace("%", "/%")); + boolean b = tbPeople.getRelName().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbPeople.setRelName("/%"); } } List peopleList = tbPeopleDao.queryByPage(tbPeople); diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProDepartServiceImpl.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProDepartServiceImpl.java index 1d30adc..5a6195a 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProDepartServiceImpl.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProDepartServiceImpl.java @@ -64,19 +64,15 @@ public class TbProDepartServiceImpl implements TbProDepartService { @Override public List queryByPage(TbProDepart tbProDepart) { if (tbProDepart.getDepartName() != null) { - String departName = tbProDepart.getDepartName(); - if (Constants.UNDERLINE.equals(departName)) { - tbProDepart.setDepartName(departName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(departName)) { - tbProDepart.setDepartName(departName.replace("%", "/%")); + boolean b = tbProDepart.getDepartName().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbProDepart.setDepartName("/%"); } } if (tbProDepart.getHeadUser() != null) { - String headUser = tbProDepart.getHeadUser(); - if (Constants.UNDERLINE.equals(headUser)) { - tbProDepart.setHeadUser(headUser.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(headUser)) { - tbProDepart.setHeadUser(headUser.replace("%", "/%")); + boolean b = tbProDepart.getHeadUser().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbProDepart.setHeadUser("/%"); } } List list = tbProDepartDao.queryByPage(tbProDepart); diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProPowerServiceImpl.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProPowerServiceImpl.java index 8dbf0a8..e78e3e5 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProPowerServiceImpl.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProPowerServiceImpl.java @@ -67,11 +67,9 @@ public class TbProPowerServiceImpl implements TbProPowerService { @Override public List queryByPage(TbProPower tbProPower) { if (tbProPower.getGtName() != null) { - String gtName = tbProPower.getGtName(); - if (Constants.UNDERLINE.equals(gtName)) { - tbProPower.setGtName(gtName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(gtName)) { - tbProPower.setGtName(gtName.replace("%", "/%")); + boolean b = tbProPower.getGtName().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbProPower.setGtName("/%"); } } return tbProPowerDao.queryByPage(tbProPower); diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProjectServiceImpl.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProjectServiceImpl.java index 32d8f3e..0be2745 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProjectServiceImpl.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProjectServiceImpl.java @@ -59,19 +59,15 @@ public class TbProjectServiceImpl implements TbProjectService { @Override public List queryByPage(TbProject tbProject) { if (tbProject.getDepartName() != null) { - String departName = tbProject.getDepartName(); - if (Constants.UNDERLINE.equals(departName)) { - tbProject.setDepartName(departName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(departName)) { - tbProject.setDepartName(departName.replace("%", "/%")); + boolean b = tbProject.getDepartName().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbProject.setDepartName("/%"); } } if (tbProject.getProName() != null) { - String proName = tbProject.getProName(); - if (Constants.UNDERLINE.equals(proName)) { - tbProject.setProName(proName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(proName)) { - tbProject.setProName(proName.replace("%", "/%")); + boolean b = tbProject.getProName().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbProject.setProName("/%"); } } return tbProjectDao.queryByPage(tbProject); diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbTeamServiceImpl.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbTeamServiceImpl.java index 92104e8..20d748c 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbTeamServiceImpl.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbTeamServiceImpl.java @@ -84,27 +84,21 @@ public class TbTeamServiceImpl implements TbTeamService { @Override public List queryByPage(TbTeam tbTeam) { if (tbTeam.getTeamName() != null) { - String teamName = tbTeam.getTeamName(); - if (Constants.UNDERLINE.equals(teamName)) { - tbTeam.setTeamName(teamName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(teamName)) { - tbTeam.setTeamName(teamName.replace("%", "/%")); + boolean b = tbTeam.getTeamName().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbTeam.setTeamName("/%"); } } if (tbTeam.getRelName() != null) { - String relName = tbTeam.getRelName(); - if (Constants.UNDERLINE.equals(relName)) { - tbTeam.setRelName(relName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(relName)) { - tbTeam.setRelName(relName.replace("%", "/%")); + boolean b = tbTeam.getRelName().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbTeam.setRelName("/%"); } } if (tbTeam.getKeyWord() != null) { - String keyWord = tbTeam.getKeyWord(); - if (Constants.UNDERLINE.equals(keyWord)) { - tbTeam.setKeyWord(keyWord.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(keyWord)) { - tbTeam.setKeyWord(keyWord.replace("%", "/%")); + boolean b = tbTeam.getKeyWord().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbTeam.setKeyWord("/%"); } } List teamList = tbTeamDao.queryByPage(tbTeam); diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbUserPostServiceImpl.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbUserPostServiceImpl.java index c842b77..998bc58 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbUserPostServiceImpl.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbUserPostServiceImpl.java @@ -36,19 +36,15 @@ public class TbUserPostServiceImpl implements TbUserPostService { @Override public List queryByPage(TbUserPost tbUserPost) { if (tbUserPost.getPostName() != null) { - String postName = tbUserPost.getPostName(); - if (Constants.UNDERLINE.equals(postName)) { - tbUserPost.setPostName(postName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(postName)) { - tbUserPost.setPostName(postName.replace("%", "/%")); + boolean b = tbUserPost.getPostName().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbUserPost.setPostName("/%"); } } if (tbUserPost.getRelName() != null) { - String relName = tbUserPost.getRelName(); - if (Constants.UNDERLINE.equals(relName)) { - tbUserPost.setRelName(relName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(relName)) { - tbUserPost.setRelName(relName.replace("%", "/%")); + boolean b = tbUserPost.getRelName().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbUserPost.setRelName("/%"); } } List list = tbUserPostDao.queryByPage(tbUserPost); diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbWarnConfigServiceImpl.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbWarnConfigServiceImpl.java index b6fc71e..15f6ebc 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbWarnConfigServiceImpl.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbWarnConfigServiceImpl.java @@ -129,11 +129,9 @@ public class TbWarnConfigServiceImpl implements TbWarnConfigService { @Override public List getAll(TbWarnConfig record){ if (record.getConfigName() != null) { - String configName = record.getConfigName(); - if (Constants.UNDERLINE.equals(configName)) { - record.setConfigName(configName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(configName)) { - record.setConfigName(configName.replace("%", "/%")); + boolean b = record.getConfigName().matches(Constants.DISALLOWED_REGEX); + if (b) { + record.setConfigName("/%"); } } List list = tbWarnConfigMapper.getAll(record); diff --git a/bonus-modules/base/src/main/java/com/bonus/base/screen/service/impl/ProjectViewServiceImpl.java b/bonus-modules/base/src/main/java/com/bonus/base/screen/service/impl/ProjectViewServiceImpl.java index cb1411a..b512cde 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/screen/service/impl/ProjectViewServiceImpl.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/screen/service/impl/ProjectViewServiceImpl.java @@ -89,11 +89,9 @@ public class ProjectViewServiceImpl { public List getDeviceWarnRecord(DeviceWarnRecordVo deviceWarnRecordVo) { if (deviceWarnRecordVo.getProName() != null) { - String proName = deviceWarnRecordVo.getProName(); - if (Constants.UNDERLINE.equals(proName)) { - deviceWarnRecordVo.setProName(proName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(proName)) { - deviceWarnRecordVo.setProName(proName.replace("%", "/%")); + boolean b = deviceWarnRecordVo.getProName().matches(Constants.DISALLOWED_REGEX); + if (b) { + deviceWarnRecordVo.setProName("/%"); } } return tbDeviceDataRecord.getDeviceWarnRecord(deviceWarnRecordVo); @@ -106,11 +104,9 @@ public class ProjectViewServiceImpl { */ public List getWarnPredictionRecord(WarnPredictionRecordVo record) { if (record.getProName() != null) { - String proName = record.getProName(); - if (Constants.UNDERLINE.equals(proName)) { - record.setProName(proName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(proName)) { - record.setProName(proName.replace("%", "/%")); + boolean b = record.getProName().matches(Constants.DISALLOWED_REGEX); + if (b) { + record.setProName("/%"); } } return tbDeviceDataRecord.getWarnPredictionRecord(record); @@ -177,19 +173,15 @@ public class ProjectViewServiceImpl { */ public List getDeviceModelDetailsPage(TbDevice tbDevice) { if (tbDevice.getDevName() != null) { - String devName = tbDevice.getDevName(); - if (Constants.UNDERLINE.equals(devName)) { - tbDevice.setDevName(devName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(devName)) { - tbDevice.setDevName(devName.replace("%", "/%")); + boolean b = tbDevice.getDevName().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbDevice.setDevName("/%"); } } if (tbDevice.getDevCode() != null) { - String devCode = tbDevice.getDevCode(); - if (Constants.UNDERLINE.equals(devCode)) { - tbDevice.setDevCode(devCode.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(devCode)) { - tbDevice.setDevCode(devCode.replace("%", "/%")); + boolean b = tbDevice.getDevCode().matches(Constants.DISALLOWED_REGEX); + if (b) { + tbDevice.setDevCode("/%"); } } return tbDeviceMapper.getDeviceModelDetailsPage(tbDevice); @@ -202,19 +194,15 @@ public class ProjectViewServiceImpl { */ public List getDeviceModelDataAll(TbBdDeviceRecordTwo bdData) { if (bdData.getDevName() != null) { - String devName = bdData.getDevName(); - if (Constants.UNDERLINE.equals(devName)) { - bdData.setDevName(devName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(devName)) { - bdData.setDevName(devName.replace("%", "/%")); + boolean b = bdData.getDevName().matches(Constants.DISALLOWED_REGEX); + if (b) { + bdData.setDevName("/%"); } } if (bdData.getDevCode() != null) { - String devCode = bdData.getDevCode(); - if (Constants.UNDERLINE.equals(devCode)) { - bdData.setDevCode(devCode.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(devCode)) { - bdData.setDevCode(devCode.replace("%", "/%")); + boolean b = bdData.getDevCode().matches(Constants.DISALLOWED_REGEX); + if (b) { + bdData.setDevCode("/%"); } } return tbDeviceMapper.getDeviceModelDataAll(bdData); @@ -273,19 +261,15 @@ public class ProjectViewServiceImpl { */ public List getTeamDetails(TeamRecord record) { if (record.getTeamName() != null) { - String teamName = record.getTeamName(); - if (Constants.UNDERLINE.equals(teamName)) { - record.setTeamName(teamName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(teamName)) { - record.setTeamName(teamName.replace("%", "/%")); + boolean b = record.getTeamName().matches(Constants.DISALLOWED_REGEX); + if (b) { + record.setTeamName("/%"); } } if (record.getMasterName() != null) { - String masterName = record.getMasterName(); - if (Constants.UNDERLINE.equals(masterName)) { - record.setMasterName(masterName.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(masterName)) { - record.setMasterName(masterName.replace("%", "/%")); + boolean b = record.getMasterName().matches(Constants.DISALLOWED_REGEX); + if (b) { + record.setMasterName("/%"); } } List list = new ArrayList<>(); @@ -307,11 +291,9 @@ public class ProjectViewServiceImpl { */ public List getTeamPeopleDetails(TeamRecord record) { if (record.getPeopleName() != null) { - String name = record.getPeopleName(); - if (Constants.UNDERLINE.equals(name)) { - record.setPeopleName(name.replace("_", "/_")); - } else if (Constants.PERCENT_SIGN.equals(name)) { - record.setPeopleName(name.replace("%", "/%")); + boolean b = record.getPeopleName().matches(Constants.DISALLOWED_REGEX); + if (b) { + record.setPeopleName("/%"); } } List list = new ArrayList<>();