diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java index e320929..a82485c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java @@ -12,7 +12,6 @@ import com.bonus.canteen.core.supermarket.mapper.SupermarketInfoMapper; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StringUtils; -import com.bonus.common.core.utils.encryption.Sm4Utils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.canteen.core.basic.mapper.BasicAreaMapper; @@ -44,9 +43,7 @@ public class BasicAreaServiceImpl implements IBasicAreaService { */ @Override public BasicArea selectBasicAreaByAreaId(Long areaId) { - BasicArea basicArea = basicAreaMapper.selectBasicAreaByAreaId(areaId); - basicArea.setContactTel(Sm4Utils.encrypt(basicArea.getContactTel())); - return basicArea; + return basicAreaMapper.selectBasicAreaByAreaId(areaId); } /** @@ -57,16 +54,13 @@ public class BasicAreaServiceImpl implements IBasicAreaService { */ @Override public List selectBasicAreaList(BasicArea basicArea) { - List list = basicAreaMapper.selectBasicAreaList(basicArea); - list.stream().forEach(item -> item.setContactTel(Sm4Utils.encrypt(item.getContactTel()))); - return list; + return basicAreaMapper.selectBasicAreaList(basicArea); } @Override public List selectAreaTreeList(BasicArea area) { - List list = selectBasicAreaList(area); - list.stream().forEach(item -> item.setContactTel(Sm4Utils.encrypt(item.getContactTel()))); - return buildAreaTreeSelect(list); + List areas = selectBasicAreaList(area); + return buildAreaTreeSelect(areas); } /** diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenServiceImpl.java index 19f8ef3..f0b23b8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenServiceImpl.java @@ -8,7 +8,6 @@ import com.bonus.canteen.core.basic.mapper.BasicStallMapper; import com.bonus.canteen.core.utils.BnsConstants; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; -import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -37,9 +36,7 @@ public class BasicCanteenServiceImpl implements IBasicCanteenService { */ @Override public BasicCanteen selectBasicCanteenByCanteenId(Long canteenId) { - BasicCanteen basicCanteen = basicCanteenMapper.selectBasicCanteenByCanteenId(canteenId); - basicCanteen.setContactTel(Sm4Utils.encrypt(basicCanteen.getContactTel())); - return basicCanteen; + return basicCanteenMapper.selectBasicCanteenByCanteenId(canteenId); } /** @@ -50,9 +47,7 @@ public class BasicCanteenServiceImpl implements IBasicCanteenService { */ @Override public List selectBasicCanteenList(BasicCanteen basicCanteen) { - List list = basicCanteenMapper.selectBasicCanteenList(basicCanteen); - list.stream().forEach(item -> item.setContactTel(Sm4Utils.encrypt(item.getContactTel()))); - return list; + return basicCanteenMapper.selectBasicCanteenList(basicCanteen); } /** diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicStallServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicStallServiceImpl.java index 2c6dd65..0b7c84b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicStallServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicStallServiceImpl.java @@ -13,7 +13,6 @@ import com.bonus.canteen.core.device.mapper.DeviceBindMapper; import com.bonus.canteen.core.utils.BnsConstants; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; -import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -52,7 +51,6 @@ public class BasicStallServiceImpl implements IBasicStallService { List basicStallMealtimes = basicStallMealtimeMapper.selectBasicStallMealtimeList(basicStallMealtime); BasicStall basicStall = basicStallMapper.selectBasicStallByStallId(stallId); basicStall.setBasicStallMealtimeList(basicStallMealtimes); - basicStall.setContactTel(Sm4Utils.encrypt(basicStall.getContactTel())); return basicStall; } @@ -64,9 +62,7 @@ public class BasicStallServiceImpl implements IBasicStallService { */ @Override public List selectBasicStallList(BasicStall basicStall) { - List list = basicStallMapper.selectBasicStallList(basicStall); - list.stream().forEach(item -> item.setContactTel(Sm4Utils.encrypt(item.getContactTel()))); - return list; + return basicStallMapper.selectBasicStallList(basicStall); } /**