From d41349dff95bbc34d6e34997bb8c68eb0d8dc46a Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 12 十一月 2024 14:14:07 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/utils/Utils.java | 23 +++++++++++++++++++---- src/main/java/com/zy/asrs/controller/WorkController.java | 3 ++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java index 63b8369..1cdea41 100644 --- a/src/main/java/com/zy/asrs/controller/WorkController.java +++ b/src/main/java/com/zy/asrs/controller/WorkController.java @@ -13,6 +13,7 @@ import com.zy.asrs.service.BasDevpService; import com.zy.asrs.service.StaDescService; import com.zy.asrs.service.WorkService; +import com.zy.asrs.utils.Utils; import com.zy.common.model.StartupDto; import com.zy.common.utils.RoleUtils; import com.zy.common.web.BaseController; @@ -75,7 +76,7 @@ for (Integer siteId : outSite) { Map<String, Object> map = new HashMap<>(); map.put("siteId", siteId); - map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�"); + map.put("desc","[+"+ Utils.getStaName(siteId)+"+]"); result.add(map); } diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java index 64e2cfa..83f2695 100644 --- a/src/main/java/com/zy/asrs/utils/Utils.java +++ b/src/main/java/com/zy/asrs/utils/Utils.java @@ -16,10 +16,7 @@ import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import java.util.*; /** * Created by vincent on 2020/8/27 @@ -28,6 +25,24 @@ private static final DecimalFormat fmt = new DecimalFormat("##0.00"); + public static String getStaName(Integer sta){ + HashMap<Integer, String> map = new HashMap<>(); + map.put(113,"Ctu搴�102");map.put(115,"Ctu搴�101"); + map.put(204,"Ctu搴�201");map.put(304,"Ctu搴�301"); + map.put(31001,"鍥涘悜搴�101"); + + map.put(1024,"鍫嗗灈鏈哄簱鍖�1鍙峰嚭搴撳彛");map.put(1028,"鍫嗗灈鏈哄簱鍖�2鍙峰嚭搴撳彛"); + map.put(1040,"鍫嗗灈鏈哄簱鍗�1鍙峰叆搴撳彛");map.put(1042,"鍫嗗灈鏈哄簱鍗�1鍙峰嚭搴撳彛"); + + map.put(2000,"鍫嗗灈鏈哄簱鍖�2妤煎嚭鍏ュ簱鍙�");map.put(2002,"鍫嗗灈鏈哄簱鍖椾簩妤煎嚭搴撳彛"); + map.put(2010,"鍫嗗灈鏈哄簱鍗椾簩妤煎嚭鍏ュ簱鍙�");map.put(2012,"鍫嗗灈鏈哄簱鍗椾簩妤煎嚭搴撳彛"); + + + map.put(3010,"鍫嗗灈鏈哄簱鍗椾笁妤煎嚭鍏ュ簱鍙�");map.put(3012,"鍫嗗灈鏈哄簱鍗椾笁妤煎嚭搴撳彛"); + + return map.get(sta); + } + public static boolean isNorth(Integer sourceStaNo){ if ((sourceStaNo>1000 && sourceStaNo < 1040) || (sourceStaNo>2000 && sourceStaNo > 2010)|| (sourceStaNo > 3000 && sourceStaNo < 3010)){ return true; -- Gitblit v1.9.1