rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationAreaController.java
@@ -9,8 +9,10 @@ import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.entity.BasStation; import com.vincent.rsf.server.manager.entity.BasStationArea; import com.vincent.rsf.server.manager.service.BasStationAreaService; import com.vincent.rsf.server.manager.service.impl.BasStationServiceImpl; import com.vincent.rsf.server.system.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -24,6 +26,8 @@ @Autowired private BasStationAreaService basStationAreaService; @Autowired private BasStationServiceImpl basStationService; @PreAuthorize("hasAuthority('manager:basStationArea:list')") @PostMapping("/basStationArea/page") @@ -59,6 +63,13 @@ basStationArea.setCreateTime(new Date()); basStationArea.setUpdateBy(getLoginUserId()); basStationArea.setUpdateTime(new Date()); List<String> objects = new ArrayList<>(); for (String station: basStationArea.getStationAlias()) { long parseLong = Long.parseLong(station); BasStation byId = basStationService.getById(parseLong); objects.add(byId.getStationName()); } basStationArea.setStationAliasStaNo(objects); if (!basStationAreaService.save(basStationArea)) { return R.error("Save Fail"); } rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStationArea.java
@@ -177,6 +177,13 @@ @TableField(typeHandler = JacksonTypeHandler.class) private List<String> stationAlias; /** * 区域包含站点编号集 */ @ApiModelProperty(value = "区域包含站点编号集") @TableField(typeHandler = JacksonTypeHandler.class) private List<String> stationAliasStaNo; public BasStationArea() { }
@@ -173,10 +173,10 @@ if (targSiteArea != null && !targSiteArea.isEmpty()) { for (String areaId : targSiteArea) { BasStationArea basStationArea = basStationAreaService.getById(Long.parseLong(areaId)); if (basStationArea == null || basStationArea.getStationAlias() == null || basStationArea.getStationAlias().isEmpty()) { if (basStationArea == null || basStationArea.getStationAliasStaNo() == null || basStationArea.getStationAliasStaNo().isEmpty()) { continue; } siteList.put(basStationArea.getStationAreaId(), basStationArea.getStationAlias()); siteList.put(basStationArea.getStationAreaId(), basStationArea.getStationAliasStaNo()); // siteList.addAll(basStationArea.getStationAlias()); } if (!siteList.isEmpty()) { rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
@@ -248,7 +248,7 @@ } List<String> targSiteAreaList = new ArrayList<>(); for (BasStationArea basStationArea : basStationAreas) { if (basStationArea.getStationAlias().isEmpty()){ if (basStationArea.getStationAliasStaNo().isEmpty()){ continue; } targSiteAreaList.add(basStationArea.getId().toString()); @@ -259,9 +259,9 @@ int count = 0; for (BasStationArea basStationArea : basStationAreas) { count++; if (!basStationArea.getStationAlias().isEmpty()) { if (!basStationArea.getStationAliasStaNo().isEmpty()) { List<OrderOutItemDto.staListDto> maps = new ArrayList<>(); for (String site : basStationArea.getStationAlias()) { for (String site : basStationArea.getStationAliasStaNo()) { OrderOutItemDto.staListDto staListDto = new OrderOutItemDto.staListDto(); staListDto.setStaNo(site); staListDto.setStaName(site); @@ -269,7 +269,7 @@ } orderOutItemDto.setStaNos(maps); //获取满足条件站点 Set<String> stationSet = new HashSet<>(basStationArea.getStationAlias()); Set<String> stationSet = new HashSet<>(basStationArea.getStationAliasStaNo()); // Set<String> stationSet = basStationArea.getStationAlias().stream().collect(Collectors.toSet()); // Set<String> stationSet = deviceSites.stream().map(DeviceSite::getSite).collect(Collectors.toSet()); //已使用站点 @@ -295,7 +295,7 @@ // throw new CoolException("站點不存在！！"); } else if (!stas.isEmpty()) { orderOutItemDto.setTargSiteAreaNow(basStationArea.getStationAreaId()); orderOutItemDto.setSiteNo(basStationArea.getStationAlias().get(0)); orderOutItemDto.setSiteNo(basStationArea.getStationAliasStaNo().get(0)); } else { throw new CoolException("未找到符合条件站点！！！请检查库区或者路径配置！！！"); }
