diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/controller/BigScreenController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/controller/BigScreenController.java index 8875adb..c15d62a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/controller/BigScreenController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/controller/BigScreenController.java @@ -5,6 +5,7 @@ import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.nl.common.base.TableDataInfo; import org.nl.common.logging.annotation.Log; import org.nl.wms.bigscreen_manage.service.BigScreenService; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -40,10 +42,11 @@ public class BigScreenController { @Log("大屏数据") @SaIgnore public ResponseEntity getData(@RequestBody JSONObject stors) { - List list = new ArrayList<>(); - list.add("GW"); - list.add("GW"); - List data = bigScreenService.getData(list); + String string = stors.getString("stors"); + List data = new ArrayList<>(); + if (!StringUtils.isEmpty(string)){ + data = bigScreenService.getData(Arrays.asList(string.split(","))); + } return new ResponseEntity<>(TableDataInfo.build(data), HttpStatus.OK); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/impl/BigScreenServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/impl/BigScreenServiceImpl.java index a54a637..0c68f97 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/impl/BigScreenServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/bigscreen_manage/service/impl/BigScreenServiceImpl.java @@ -66,7 +66,7 @@ public class BigScreenServiceImpl implements BigScreenService { for (String storCode : stors) { JSONObject item = new JSONObject(); //1.【货位使用】数据 - item.put("title","GW仓库"); + item.put("title",storCode+"仓库"); item.put("pointUse", pointUse(storCode)); // //2.【实时库存分析】数据 item.put("ivtAnalyse", ivtAnalyse(storCode));