This commit is contained in:
2023-06-21 16:04:47 +08:00
parent 2097566b9a
commit 8562600497
3 changed files with 18 additions and 16 deletions

View File

@@ -641,6 +641,10 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
@Override
public List<PileBasicInfo> getPileListByStationId(String stationId) {
return pileBasicInfoMapper.getPileListByStationId(stationId);
String redisKey = CacheConstants.GET_PILE_LIST_BY_STATION_ID + stationId;
List<PileBasicInfo> pileList = pileBasicInfoMapper.getPileListByStationId(stationId);
return pileList;
}
}

View File

@@ -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<String, String> longitudeAndLatitude = AddressUtils.getLongitudeAndLatitude(dto.getAreaCode(), dto.getAddress());
if (longitudeAndLatitude != null) {