From 70e0a1a07c29a54912d36fc44eb03c5491112477 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期六, 07 三月 2026 09:59:26 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStationArea.java | 7 +++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java | 4 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationAreaController.java | 11 +++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 10 +++++-----
4 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationAreaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationAreaController.java
index 0961847..c91ae3c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationAreaController.java
+++ b/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");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStationArea.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStationArea.java
index 25bf1ab..624f1e2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStationArea.java
+++ b/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() {
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java
index e6f0307..ac89c8c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java
@@ -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()) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
index ee01b4f..cd7487f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
+++ b/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("鏈壘鍒扮鍚堟潯浠剁珯鐐癸紒锛侊紒璇锋鏌ュ簱鍖烘垨鑰呰矾寰勯厤缃紒锛侊紒");
}
--
Gitblit v1.9.1