From d903650986f980606bd292d34ba6b91e429962a4 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 12 Sep 2024 14:19:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E3=80=81=E8=BD=A6?= =?UTF-8?q?=E7=89=8C=E5=8F=B7=E5=8A=A0=E5=AF=86=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../background/service/impl/HumanServiceImpl.java | 9 +++++---- .../background/service/impl/TeamServiceImpl.java | 10 +++++----- .../background/service/impl/VehicleServiceImpl.java | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java index f2b424d..70d731f 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java @@ -10,10 +10,7 @@ import com.securitycontrol.common.core.constant.SecurityConstants; import com.securitycontrol.common.core.domain.Result; import com.securitycontrol.common.core.utils.StringUtils; import com.securitycontrol.common.core.utils.UploadCheckUtils; -import com.securitycontrol.common.core.utils.aes.AesCbcUtils; -import com.securitycontrol.common.core.utils.aes.DateTimeHelper; -import com.securitycontrol.common.core.utils.aes.ListHelper; -import com.securitycontrol.common.core.utils.aes.StringHelper; +import com.securitycontrol.common.core.utils.aes.*; import com.securitycontrol.common.core.utils.uuid.IdUtils; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.common.security.utils.ValidatorsUtils; @@ -268,6 +265,10 @@ public class HumanServiceImpl implements HumanService { List list = new ArrayList<>(); list=mapper.getUserAccessList(dto); + list.forEach(item->{ + item.setIdNumber(SM4Utils.encryptData(item.getIdNumber())); + item.setUserPhone(SM4Utils.encryptData(item.getUserPhone())); + }); // try { // dto.setTypeCode(Constant.PERSON_CAR_TYPE); // dto.setModeName(Constant.PERSON); diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamServiceImpl.java index 5616531..4df3a5d 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamServiceImpl.java @@ -6,6 +6,7 @@ import com.securitycontrol.background.service.TeamService; import com.securitycontrol.common.core.constant.Constant; import com.securitycontrol.common.core.utils.StringUtils; import com.securitycontrol.common.core.utils.aes.AesCbcUtils; +import com.securitycontrol.common.core.utils.aes.SM4Utils; import com.securitycontrol.common.core.utils.uuid.IdUtils; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.common.security.utils.ValidatorsUtils; @@ -76,7 +77,8 @@ public class TeamServiceImpl implements TeamService { } else { vo.setType(2); } - vo.setIdNumber(AesCbcUtils.encrypt(vo.getIdNumber())); + vo.setIdNumber(SM4Utils.encryptData_CBC(vo.getIdNumber())); + vo.setTeamLeaderPhone(SM4Utils.encryptData_CBC(vo.getTeamLeaderPhone())); mapper.addOrUpdateTeam(vo); } catch (Exception e) { log.error("新增/修改班组", e); @@ -119,10 +121,8 @@ public class TeamServiceImpl implements TeamService { TeamManageVo vo = new TeamManageVo(); try { vo = mapper.getTeamDetailById(dto); - String decryptIdNumber = AesCbcUtils.decrypt(vo.getIdNumber()); - if (decryptIdNumber != null) { - vo.setIdNumber(decryptIdNumber); - } + vo.setIdNumber(SM4Utils.encryptData(vo.getIdNumber())); + vo.setTeamLeaderPhone(SM4Utils.encryptData(vo.getTeamLeaderPhone())); } catch (Exception e) { log.error("班组详情", e); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/VehicleServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/VehicleServiceImpl.java index 191fb26..07de4e8 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/VehicleServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/VehicleServiceImpl.java @@ -71,8 +71,8 @@ public class VehicleServiceImpl implements VehicleService { } else { vo.setType(2); } - vo.setCarNum(SM4Utils.encryptData(vo.getCarNum())); - vo.setPhone(SM4Utils.encryptData(vo.getPhone())); + vo.setCarNum(SM4Utils.encryptData_CBC(vo.getCarNum())); + vo.setPhone(SM4Utils.encryptData_CBC(vo.getPhone())); mapper.addOrUpdateVehicle(vo); } catch (Exception e) { log.error("车辆新增/修改", e);