From 03b9be24e5a9bc5cf746beac1ac43330183c2c63 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 15 一月 2026 13:32:37 +0800
Subject: [PATCH] agv定时任务后分配站点
---
src/main/java/com/zy/asrs/task/handler/AgvHandler.java | 159 +++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 148 +++++++++---------------
2 files changed, 209 insertions(+), 98 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index a7ef72a..173cf0c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -257,106 +257,68 @@
throw new CoolException("璇风瓑寰呭嚭搴撳畬鎴�,type:" + type);
}
- // 妫�鏌ョ珯鐐规槸鍚︽湁鏈畬鎴愮殑AGV浠诲姟
- // 瑙勫垯锛氬綋鏌愪釜绔欑偣鏈夋湭瀹屾垚鐨凙GV浠诲姟鏃讹紝涓嶅垎閰嶈绔欑偣锛涘彧浠庢病鏈夋湭瀹屾垚浠诲姟鐨勭珯鐐逛腑閫夋嫨
- // 灏嗙珯鐐瑰垪琛ㄨ浆鎹负瀛楃涓插垪琛紙Task琛ㄧ殑sta_no鏄疭tring绫诲瀷锛�
- List<String> siteStrList = canInSites.stream()
- .map(String::valueOf)
- .collect(Collectors.toList());
-
- // 鏌ヨ杩欎簺绔欑偣涓湁鏈畬鎴怉GV浠诲姟鐨勭珯鐐癸紙wrk_sts涓嶅湪5鍜�15涔嬮棿琛ㄧず鏈畬鎴愶級
- List<Task> unfinishedTasks = taskService.selectList(new EntityWrapper<Task>()
- .in("sta_no", siteStrList)
- .eq("task_type", "agv") // 鍙煡璇GV浠诲姟
- .last("AND wrk_sts NOT IN (5, 15)") // 鎺掗櫎宸插畬鎴愮姸鎬侊紙5鍜�15琛ㄧず宸插畬鎴愶級
- );
-
- // 鑾峰彇鏈夋湭瀹屾垚浠诲姟鐨勭珯鐐归泦鍚堬紙杩欎簺绔欑偣灏嗚鎺掗櫎锛屼笉鍙備笌鍒嗛厤锛�
- Set<String> sitesWithUnfinishedTasks = unfinishedTasks.stream()
- .map(Task::getStaNo)
- .collect(Collectors.toSet());
-
- // 浠庡彲鐢ㄧ珯鐐逛腑鎺掗櫎鏈夋湭瀹屾垚浠诲姟鐨勭珯鐐癸紝鍙繚鐣欐病鏈夋湭瀹屾垚浠诲姟鐨勭珯鐐�
- List<Integer> availableSites = canInSites.stream()
- .filter(site -> !sitesWithUnfinishedTasks.contains(String.valueOf(site)))
- .collect(Collectors.toList());
-
- // 濡傛灉鎵�鏈夌珯鐐归兘鏈夋湭瀹屾垚浠诲姟锛屽垯娌℃湁鍙敤绔欑偣锛屼笉鍒嗛厤
- if (availableSites.isEmpty()) {
- String groupName = (whsType != null && whsType.equals(agvProperties.getWhsTypeMapping().getInboundArea()))
- ? "涓滀晶" : "瑗夸晶";
- log.warn("{}鎵�鏈夌珯鐐癸紙{}锛夐兘鏈夋湭瀹屾垚鐨凙GV浠诲姟锛屾棤娉曞垎閰嶇珯鐐癸紝璇风瓑寰呬换鍔″畬鎴�", groupName, canInSites);
- throw new CoolException(groupName + "鎵�鏈夌珯鐐归兘鏈夋湭瀹屾垚鐨凙GV浠诲姟锛岃绛夊緟浠诲姟瀹屾垚鍚庡啀璇�");
- }
-
- // 璁板綍绔欑偣鍒嗛厤淇℃伅
- if (!sitesWithUnfinishedTasks.isEmpty()) {
- log.info("绔欑偣鍒嗛厤妫�鏌ワ細鎬荤珯鐐规暟={}锛屾湁鏈畬鎴愪换鍔＄殑绔欑偣={}锛堝凡鎺掗櫎锛夛紝鍙敤绔欑偣鏁�={}锛屽彲鐢ㄧ珯鐐�={}",
- canInSites.size(), sitesWithUnfinishedTasks, availableSites.size(), availableSites);
- } else {
- log.info("绔欑偣鍒嗛厤妫�鏌ワ細鎵�鏈夌珯鐐癸紙{}锛夐兘娌℃湁鏈畬鎴愪换鍔★紝鍏ㄩ儴鍙敤", canInSites);
- }
-
- // 瀵绘壘鍏ュ簱浠诲姟鏈�灏戠殑绔欑偣锛堝彧浠庡彲鐢ㄧ珯鐐逛腑閫夋嫨锛屼笖蹇呴』in_enable="Y"鑳藉叆 鍜� canining="Y"鍙叆锛�
+ // 瀵绘壘鍏ュ簱浠诲姟鏈�灏戠殑绔欑偣锛堜笖蹇呴』in_enable="Y"鑳藉叆 鍜� canining="Y"鍙叆锛�
+ // 娉ㄦ剰锛氫笉鍦ㄦ澶勬鏌ユ湭瀹屾垚鐨凙GV浠诲姟锛屽厑璁窹DA鎸佺画鐢宠涓嬪崟
+ // 鏈畬鎴愪换鍔＄殑妫�鏌ュ皢鍦ㄥ彂閫丄GV璇锋眰鏃惰繘琛岋紙AgvHandler.callAgv锛�
List<BasDevp> devList = basDevpMapper.selectList(new EntityWrapper<BasDevp>()
- .in("dev_no", availableSites)
+ .in("dev_no", canInSites)
.eq("in_enable", "Y") // in_enable鏄兘鍏�
.eq("canining", "Y") // canining鏄彲鍏�
);
- // 濡傛灉鏌ヨ缁撴灉涓虹┖锛岃鏄庢病鏈夊彲鍏ョ殑绔欑偣
- if (devList.isEmpty()) {
+ // 閫夋嫨绔欑偣锛堝鏋滃彲鍏ョ珯鐐逛负绌猴紝鍒欎笉鍦ㄥ垱寤轰换鍔℃椂鍒嗛厤绔欑偣锛岀敱瀹氭椂浠诲姟鍒嗛厤锛�
+ Integer endSite = null;
+ if (!devList.isEmpty()) {
+ // 鍏ュ簱浠诲姟鏁版帓搴�
+ devList.sort(Comparator.comparing(BasDevp::getInQty));
+
+ // 閫夋嫨绔欑偣
+ BasDevp basDevp;
+
+ // 鑾峰彇鏈�灏戜换鍔℃暟
+ int minInQty = devList.get(0).getInQty();
+
+ // 绛涢�夊嚭浠诲姟鏁版渶灏戠殑绔欑偣鍒楄〃
+ List<BasDevp> minTaskSites = devList.stream()
+ .filter(dev -> dev.getInQty() == minInQty)
+ .collect(Collectors.toList());
+
+ // 鏍规嵁閰嶇疆閫夋嫨鍒嗛厤绛栫暐
+ String strategy = agvProperties.getSiteAllocation().getStrategy();
+ boolean enableRoundRobin = agvProperties.getSiteAllocation().isEnableRoundRobin();
+
+ if (minTaskSites.size() > 1 && enableRoundRobin && "round-robin".equals(strategy)) {
+ // 杞鍒嗛厤锛氬綋澶氫釜绔欑偣浠诲姟鏁扮浉鍚屾椂锛屼娇鐢ㄨ疆璇�
+ String groupKey = (whsType != null && whsType.equals(agvProperties.getWhsTypeMapping().getInboundArea()))
+ ? "east" : "west";
+ AtomicInteger counter = siteRoundRobinCounters.computeIfAbsent(groupKey, k -> new AtomicInteger(0));
+ int index = counter.getAndIncrement() % minTaskSites.size();
+ basDevp = minTaskSites.get(index);
+ log.info("浣跨敤杞鍒嗛厤绛栫暐锛岀珯鐐圭粍锛歿}锛岃疆璇㈢储寮曪細{}锛岄�変腑绔欑偣锛歿}", groupKey, index, basDevp.getDevNo());
+ } else if (minTaskSites.size() > 1 && enableRoundRobin && "random".equals(strategy)) {
+ // 闅忔満鍒嗛厤
+ Random random = new Random();
+ int index = random.nextInt(minTaskSites.size());
+ basDevp = minTaskSites.get(index);
+ log.info("浣跨敤闅忔満鍒嗛厤绛栫暐锛岄�変腑绔欑偣锛歿}", basDevp.getDevNo());
+ } else {
+ // 榛樿锛氶�夋嫨绗竴涓紙浠诲姟鏈�灏戠殑锛�
+ basDevp = devList.get(0);
+ if (minTaskSites.size() > 1) {
+ log.info("澶氫釜绔欑偣浠诲姟鏁扮浉鍚岋紙{}锛夛紝浣嗘湭鍚敤杞锛岄�夋嫨绗竴涓珯鐐癸細{}", minInQty, basDevp.getDevNo());
+ }
+ }
+
+ endSite = basDevp.getDevNo();
+
+ // 鍏ュ簱鏆傚瓨+1
+ basDevpMapper.incrementInQty(endSite);
+ } else {
+ // 娌℃湁鍙叆绔欑偣锛岃褰曟棩蹇椾絾涓嶉樆姝笅鍗曪紝绔欑偣鍒嗛厤灏嗗湪瀹氭椂浠诲姟涓鐞�
String groupName = (whsType != null && whsType.equals(agvProperties.getWhsTypeMapping().getInboundArea()))
? "涓滀晶" : "瑗夸晶";
- log.warn("{}鍙敤绔欑偣锛坽}锛変腑娌℃湁鍙叆绔欑偣锛坕n_enable='Y'涓攃anining='Y'锛夛紝鏃犳硶鍒嗛厤", groupName, availableSites);
- throw new CoolException(groupName + "鍙敤绔欑偣涓病鏈夊彲鍏ョ珯鐐癸紝璇锋鏌ョ珯鐐归厤缃�");
+ log.warn("{}鍙敤绔欑偣锛坽}锛変腑娌℃湁鍙叆绔欑偣锛坕n_enable='Y'涓攃anining='Y'锛夛紝鏆備笉鍒嗛厤绔欑偣锛屽皢鍦ㄥ畾鏃朵换鍔′腑鍒嗛厤", groupName, canInSites);
}
-
- // 鍏ュ簱浠诲姟鏁版帓搴�
- devList.sort(Comparator.comparing(BasDevp::getInQty));
-
- // 閫夋嫨绔欑偣
- BasDevp basDevp;
- int endSite;
-
- // 鑾峰彇鏈�灏戜换鍔℃暟
- int minInQty = devList.get(0).getInQty();
-
- // 绛涢�夊嚭浠诲姟鏁版渶灏戠殑绔欑偣鍒楄〃
- List<BasDevp> minTaskSites = devList.stream()
- .filter(dev -> dev.getInQty() == minInQty)
- .collect(Collectors.toList());
-
- // 鏍规嵁閰嶇疆閫夋嫨鍒嗛厤绛栫暐
- String strategy = agvProperties.getSiteAllocation().getStrategy();
- boolean enableRoundRobin = agvProperties.getSiteAllocation().isEnableRoundRobin();
-
- if (minTaskSites.size() > 1 && enableRoundRobin && "round-robin".equals(strategy)) {
- // 杞鍒嗛厤锛氬綋澶氫釜绔欑偣浠诲姟鏁扮浉鍚屾椂锛屼娇鐢ㄨ疆璇�
- String groupKey = (whsType != null && whsType.equals(agvProperties.getWhsTypeMapping().getInboundArea()))
- ? "east" : "west";
- AtomicInteger counter = siteRoundRobinCounters.computeIfAbsent(groupKey, k -> new AtomicInteger(0));
- int index = counter.getAndIncrement() % minTaskSites.size();
- basDevp = minTaskSites.get(index);
- log.info("浣跨敤杞鍒嗛厤绛栫暐锛岀珯鐐圭粍锛歿}锛岃疆璇㈢储寮曪細{}锛岄�変腑绔欑偣锛歿}", groupKey, index, basDevp.getDevNo());
- } else if (minTaskSites.size() > 1 && enableRoundRobin && "random".equals(strategy)) {
- // 闅忔満鍒嗛厤
- Random random = new Random();
- int index = random.nextInt(minTaskSites.size());
- basDevp = minTaskSites.get(index);
- log.info("浣跨敤闅忔満鍒嗛厤绛栫暐锛岄�変腑绔欑偣锛歿}", basDevp.getDevNo());
- } else {
- // 榛樿锛氶�夋嫨绗竴涓紙浠诲姟鏈�灏戠殑锛�
- basDevp = devList.get(0);
- if (minTaskSites.size() > 1) {
- log.info("澶氫釜绔欑偣浠诲姟鏁扮浉鍚岋紙{}锛夛紝浣嗘湭鍚敤杞锛岄�夋嫨绗竴涓珯鐐癸細{}", minInQty, basDevp.getDevNo());
- }
- }
-
- endSite = basDevp.getDevNo();
-
- // 鍏ュ簱鏆傚瓨+1
- basDevpMapper.incrementInQty(endSite);
// 鑾峰彇宸ヤ綔鍙�
@@ -370,7 +332,7 @@
.setIoType(ioType) // 鍏ュ嚭搴撶姸鎬侊細 1.鍏ュ簱
.setTaskType("agv")
.setIoPri(10D)
- .setStaNo(String.valueOf(endSite))
+ .setStaNo(endSite != null ? String.valueOf(endSite) : null) // 濡傛灉鍒嗛厤浜嗙珯鐐瑰垯璁剧疆锛屽惁鍒欎负null锛岀敱瀹氭椂浠诲姟鍒嗛厤
.setSourceStaNo(sourceSite) // 璁剧疆婧愮珯鐐�
.setInvWh(robotGroup) // 鏍规嵁whs_type璁剧疆鏈哄櫒浜虹粍
.setFullPlt(ioType != 10 ? "N" : "Y")// 婊℃澘锛歒
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
index cbada90..60afb65 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvHandler.java
@@ -6,6 +6,8 @@
import com.zy.asrs.entity.Task;
import com.zy.asrs.entity.TaskLog;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.mapper.BasStationMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.ApiLogService;
@@ -20,11 +22,9 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -52,7 +52,16 @@
private BasStationMapper basStationMapper;
@Resource
+ private BasDevpMapper basDevpMapper;
+
+ @Resource
private AgvProperties agvProperties;
+
+ /**
+ * 绔欑偣杞璁℃暟鍣紝鐢ㄤ簬骞冲潎鍒嗛厤绔欑偣
+ * Key: 绔欑偣缁勬爣璇嗭紙濡� "east" 鎴� "west"锛夛紝Value: 褰撳墠杞绱㈠紩
+ */
+ private final Map<String, AtomicInteger> siteRoundRobinCounters = new ConcurrentHashMap<>();
/**
* 鍛煎彨agv鎼繍
@@ -64,6 +73,37 @@
}
for (Task task : taskList) {
+ // 濡傛灉浠诲姟娌℃湁鍒嗛厤绔欑偣锛屽厛鍒嗛厤绔欑偣
+ String staNo = task.getStaNo();
+ if (staNo == null || staNo.isEmpty()) {
+ Integer allocatedSite = allocateSiteForTask(task);
+ if (allocatedSite == null) {
+ log.warn("浠诲姟ID锛歿}鏃犳硶鍒嗛厤绔欑偣锛岃烦杩囨湰娆″彂閫�", task.getId());
+ continue; // 鏃犳硶鍒嗛厤绔欑偣锛岃烦杩囨湰娆″彂閫�
+ }
+ staNo = String.valueOf(allocatedSite);
+ task.setStaNo(staNo);
+ taskService.updateById(task);
+ log.info("浠诲姟ID锛歿}宸插垎閰嶇珯鐐癸細{}", task.getId(), staNo);
+ }
+
+ // 妫�鏌ョ洰鏍囩珯鐐规槸鍚︽湁鏈畬鎴愮殑AGV浠诲姟
+ // 濡傛灉绔欑偣鏈夋湭瀹屾垚鐨勪换鍔★紝鍒欒烦杩囨湰娆″彂閫侊紝绛夊緟涓嬫
+ if (staNo != null && !staNo.isEmpty()) {
+ List<Task> unfinishedTasks = taskService.selectList(new EntityWrapper<Task>()
+ .eq("sta_no", staNo)
+ .eq("task_type", "agv")
+ .ne("id", task.getId()) // 鎺掗櫎褰撳墠浠诲姟鏈韩
+ .last("AND wrk_sts NOT IN (5, 15)") // 鎺掗櫎宸插畬鎴愮姸鎬�
+ );
+
+ if (!unfinishedTasks.isEmpty()) {
+ log.info("绔欑偣{}鏈墈}涓湭瀹屾垚鐨凙GV浠诲姟锛岃烦杩囨湰娆″彂閫侊紝绛夊緟浠诲姟瀹屾垚銆傚綋鍓嶄换鍔D锛歿}",
+ staNo, unfinishedTasks.size(), task.getId());
+ continue; // 璺宠繃鏈鍙戦�侊紝绛夊緟涓嬫
+ }
+ }
+
// 鍛煎彨agv
String response = "";
boolean success = false;
@@ -197,6 +237,115 @@
}
/**
+ * 涓轰换鍔″垎閰嶇珯鐐癸紙瀹氭椂浠诲姟涓皟鐢級
+ * @param task 浠诲姟瀵硅薄
+ * @return 鍒嗛厤鐨勭珯鐐圭紪鍙凤紝濡傛灉鏃犳硶鍒嗛厤鍒欒繑鍥瀗ull
+ */
+ private Integer allocateSiteForTask(Task task) {
+ // 鏍规嵁浠诲姟鐨刬nvWh锛堟満鍣ㄤ汉缁勶級鍒ゆ柇鏄笢渚ц繕鏄タ渚�
+ String robotGroup = task.getInvWh();
+ List<String> targetStations;
+ String groupKey;
+
+ if (robotGroup != null && robotGroup.equals(agvProperties.getRobotGroupEast())) {
+ // 涓滀晶绔欑偣
+ targetStations = agvProperties.getEastStations();
+ groupKey = "east";
+ } else if (robotGroup != null && robotGroup.equals(agvProperties.getRobotGroupWest())) {
+ // 瑗夸晶绔欑偣
+ targetStations = agvProperties.getWestStations();
+ groupKey = "west";
+ } else {
+ // 榛樿浣跨敤涓滀晶
+ targetStations = agvProperties.getEastStations();
+ groupKey = "east";
+ log.warn("浠诲姟ID锛歿}鐨勬満鍣ㄤ汉缁剓}鏈瘑鍒紝浣跨敤榛樿涓滀晶绔欑偣", task.getId(), robotGroup);
+ }
+
+ if (targetStations.isEmpty()) {
+ log.warn("浠诲姟ID锛歿}娌℃湁鍙敤鐨勭洰鏍囩珯鐐归厤缃�", task.getId());
+ return null;
+ }
+
+ // 灏嗙珯鐐瑰瓧绗︿覆鍒楄〃杞崲涓烘暣鏁板垪琛�
+ List<Integer> siteIntList = targetStations.stream()
+ .map(Integer::parseInt)
+ .collect(Collectors.toList());
+
+ // 鍒ゆ柇鑳藉叆绔欑偣锛坕n_enable="Y"琛ㄧず鑳藉叆锛�
+ List<Integer> sites = basDevpMapper.selectList(
+ new EntityWrapper<BasDevp>()
+ .eq("in_enable", "Y")
+ .in("dev_no", siteIntList)
+ ).stream().map(BasDevp::getDevNo).collect(Collectors.toList());
+
+ if (sites.isEmpty()) {
+ log.warn("浠诲姟ID锛歿}娌℃湁鑳藉叆绔欑偣", task.getId());
+ return null;
+ }
+
+ // 鑾峰彇娌℃湁鍑哄簱浠诲姟鐨勭珯鐐�
+ List<Integer> canInSites = basDevpMapper.getCanInSites(sites);
+ if (canInSites.isEmpty()) {
+ log.warn("浠诲姟ID锛歿}娌℃湁鍙叆绔欑偣锛堣绛夊緟鍑哄簱瀹屾垚锛�", task.getId());
+ return null;
+ }
+
+ // 瀵绘壘鍏ュ簱浠诲姟鏈�灏戠殑绔欑偣锛堜笖蹇呴』in_enable="Y"鑳藉叆 鍜� canining="Y"鍙叆锛�
+ List<BasDevp> devList = basDevpMapper.selectList(new EntityWrapper<BasDevp>()
+ .in("dev_no", canInSites)
+ .eq("in_enable", "Y")
+ .eq("canining", "Y")
+ );
+
+ if (devList.isEmpty()) {
+ log.warn("浠诲姟ID锛歿}娌℃湁鍙叆绔欑偣锛坕n_enable='Y'涓攃anining='Y'锛�", task.getId());
+ return null;
+ }
+
+ // 鍏ュ簱浠诲姟鏁版帓搴�
+ devList.sort(Comparator.comparing(BasDevp::getInQty));
+
+ // 閫夋嫨绔欑偣
+ BasDevp basDevp;
+ int minInQty = devList.get(0).getInQty();
+
+ // 绛涢�夊嚭浠诲姟鏁版渶灏戠殑绔欑偣鍒楄〃
+ List<BasDevp> minTaskSites = devList.stream()
+ .filter(dev -> dev.getInQty() == minInQty)
+ .collect(Collectors.toList());
+
+ // 鏍规嵁閰嶇疆閫夋嫨鍒嗛厤绛栫暐
+ String strategy = agvProperties.getSiteAllocation().getStrategy();
+ boolean enableRoundRobin = agvProperties.getSiteAllocation().isEnableRoundRobin();
+
+ if (minTaskSites.size() > 1 && enableRoundRobin && "round-robin".equals(strategy)) {
+ // 杞鍒嗛厤
+ AtomicInteger counter = siteRoundRobinCounters.computeIfAbsent(groupKey, k -> new AtomicInteger(0));
+ int index = counter.getAndIncrement() % minTaskSites.size();
+ basDevp = minTaskSites.get(index);
+ log.info("浣跨敤杞鍒嗛厤绛栫暐锛岀珯鐐圭粍锛歿}锛岃疆璇㈢储寮曪細{}锛岄�変腑绔欑偣锛歿}", groupKey, index, basDevp.getDevNo());
+ } else if (minTaskSites.size() > 1 && enableRoundRobin && "random".equals(strategy)) {
+ // 闅忔満鍒嗛厤
+ Random random = new Random();
+ int index = random.nextInt(minTaskSites.size());
+ basDevp = minTaskSites.get(index);
+ log.info("浣跨敤闅忔満鍒嗛厤绛栫暐锛岄�変腑绔欑偣锛歿}", basDevp.getDevNo());
+ } else {
+ // 榛樿锛氶�夋嫨绗竴涓紙浠诲姟鏈�灏戠殑锛�
+ basDevp = devList.get(0);
+ }
+
+ Integer endSite = basDevp.getDevNo();
+
+ // 鍏ュ簱鏆傚瓨+1
+ basDevpMapper.incrementInQty(endSite);
+
+ log.info("浠诲姟ID锛歿}宸插垎閰嶇珯鐐癸細{}", task.getId(), endSite);
+ return endSite;
+ }
+
+ /**
* 鏍规嵁绔欑偣缂栧彿鍒ゆ柇鏈哄櫒浜虹粍
* @param staNo 绔欑偣缂栧彿
* @return 鏈哄櫒浜虹粍鍚嶇О
--
Gitblit v1.9.1