diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java index 0fccd4d87..058043cc4 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java @@ -25,6 +25,9 @@ public class CacheConstants { public static final String GET_PILE_MODEL_INFO_BY_MODEL_ID = "get_pile_model_info_by_model_id:"; + // 根据站点id查询充电桩列表 + public static final String GET_PILE_LIST_BY_STATION_ID = "get_pile_list_by_station_id:"; + public static final String QUERY_BILLING_DETAIL_BY_ID = "query_billing_detail_by_id:"; // diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index 01f93a570..88bed9ea0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java @@ -641,6 +641,10 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService { @Override public List getPileListByStationId(String stationId) { - return pileBasicInfoMapper.getPileListByStationId(stationId); + String redisKey = CacheConstants.GET_PILE_LIST_BY_STATION_ID + stationId; + + List pileList = pileBasicInfoMapper.getPileListByStationId(stationId); + + return pileList; } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index e04b3442d..f7dfcab2a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -17,12 +17,7 @@ import com.jsowell.pile.domain.PileStationInfo; import com.jsowell.pile.dto.FastCreateStationDTO; import com.jsowell.pile.dto.QueryStationDTO; import com.jsowell.pile.mapper.PileStationInfoMapper; -import com.jsowell.pile.service.IPileBasicInfoService; -import com.jsowell.pile.service.IPileBillingTemplateService; -import com.jsowell.pile.service.IPileConnectorInfoService; -import com.jsowell.pile.service.IPileMerchantInfoService; -import com.jsowell.pile.service.IPileStationInfoService; -import com.jsowell.pile.vo.base.ConnectorInfoVO; +import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.base.PileInfoVO; import com.jsowell.pile.vo.base.StationInfoVO; @@ -36,7 +31,6 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -223,9 +217,10 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { // 根据运营商Id查询到对应的部门id dept.setParentId(Long.parseLong(merchantInfo.getDeptId())); dept.setOrderNum(0); - dept.setDeptName(dto.getStationName()); - dept.setLeader(dto.getStationAdminName()); - dept.setPhone(dto.getStationTel()); + + dept.setDeptName(StringUtils.trim(dto.getStationName())); + dept.setLeader(StringUtils.trim(dto.getStationAdminName())); + dept.setPhone(StringUtils.trim(dto.getStationTel())); dept.setStatus("0"); sysDeptService.insertDept(dept); @@ -234,12 +229,12 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { pileStationInfo.setDeptId(String.valueOf(dept.getDeptId())); // 前端输入信息 pileStationInfo.setMerchantId(Long.valueOf(dto.getMerchantId())); - pileStationInfo.setStationName(dto.getStationName()); - pileStationInfo.setAddress(dto.getAddress()); - pileStationInfo.setAreaCode(dto.getAreaCode()); + pileStationInfo.setStationName(StringUtils.trim(dto.getStationName())); + pileStationInfo.setAddress(StringUtils.trim(dto.getAddress())); + pileStationInfo.setAreaCode(StringUtils.trim(dto.getAreaCode())); pileStationInfo.setCapacity(BigDecimal.ZERO); // 容量 - pileStationInfo.setStationTel(dto.getStationTel()); - pileStationInfo.setStationAdminName(dto.getStationAdminName()); + pileStationInfo.setStationTel(StringUtils.trim(dto.getStationTel())); + pileStationInfo.setStationAdminName(StringUtils.trim(dto.getStationAdminName())); // 获取经纬度 Map longitudeAndLatitude = AddressUtils.getLongitudeAndLatitude(dto.getAreaCode(), dto.getAddress()); if (longitudeAndLatitude != null) {