From 5467a7514cbbf3ecbf99b06a9aa5dedb7d9d63ff Mon Sep 17 00:00:00 2001 From: zhangzq Date: Sun, 25 May 2025 21:07:15 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E7=83=98=E7=AE=B1?= =?UTF-8?q?=E5=86=B7=E5=8D=B4=E5=8C=BA=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pdm/ivt/rest/CoolPointIvtController.java | 7 +++++ .../pdm/ivt/rest/HotPointIvtController.java | 7 +++++ .../pdm/ivt/service/CoolPointIvtService.java | 4 ++- .../pdm/ivt/service/HotPointIvtService.java | 4 ++- .../service/impl/CoolPointIvtServiceImpl.java | 11 ++++++++ .../service/impl/HotPointIvtServiceImpl.java | 26 +++++++++++++++++++ 6 files changed, 57 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CoolPointIvtController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CoolPointIvtController.java index c71c06d2c..2962bb6f8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CoolPointIvtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CoolPointIvtController.java @@ -1,6 +1,7 @@ package org.nl.wms.pdm.ivt.rest; +import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -79,4 +80,10 @@ public class CoolPointIvtController { return new ResponseEntity<>(HttpStatus.OK); } + @GetMapping("B1screen") + @SaIgnore + public ResponseEntity B1screen() { + return new ResponseEntity<>(coolpointivtService.B1screen(), HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/HotPointIvtController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/HotPointIvtController.java index b598d5d03..3b93a6000 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/HotPointIvtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/HotPointIvtController.java @@ -1,6 +1,7 @@ package org.nl.wms.pdm.ivt.rest; +import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -77,4 +78,10 @@ public class HotPointIvtController { hotpointivtService.uploadMes(form); return new ResponseEntity<>(HttpStatus.OK); } + + @GetMapping("B1screen") + @SaIgnore + public ResponseEntity B1screen() { + return new ResponseEntity<>(hotpointivtService.B1screen(), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CoolPointIvtService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CoolPointIvtService.java index a82690b39..168af342c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CoolPointIvtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CoolPointIvtService.java @@ -1,5 +1,6 @@ package org.nl.wms.pdm.ivt.service; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.wms.pdm.ivt.service.dto.CoolPointIvtDto; import org.springframework.data.domain.Pageable; @@ -79,4 +80,5 @@ public interface CoolPointIvtService { Map coolRegionIOQueryAll(Map whereJson, Pageable page); void uploadMes(JSONObject form); -} + + JSONArray B1screen();} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/HotPointIvtService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/HotPointIvtService.java index 9abfa2f79..61587c210 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/HotPointIvtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/HotPointIvtService.java @@ -1,5 +1,6 @@ package org.nl.wms.pdm.ivt.service; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.wms.pdm.ivt.service.dto.HotPointIvtDto; import org.springframework.data.domain.Pageable; @@ -79,5 +80,6 @@ public interface HotPointIvtService { Map taskDtlQuery(Map whereJson, Pageable page); void uploadMes(JSONObject form); + JSONArray B1screen(); -} \ No newline at end of file +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java index 914870d0f..37343b3cf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java @@ -41,6 +41,17 @@ import java.util.Map; @Slf4j public class CoolPointIvtServiceImpl implements CoolPointIvtService { + + @Override + public JSONArray B1screen() { + //获取人员对应的区域 + HashMap map = new HashMap(); + map.put("flag", "1"); + map.put("in_area_id", "('B1','B2')"); + JSONArray jsonArray = WQL.getWO("ST_IVT_COOLPOINTIVT").addParamMap(map).process().getResultJSONArray(0); + return jsonArray; + } + @Override public Map queryAll(Map whereJson, Pageable page) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java index e01c47318..b449876ba 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java @@ -45,6 +45,32 @@ public class HotPointIvtServiceImpl implements HotPointIvtService { @Autowired private RedisUtils redisUtils; + @Override + public JSONArray B1screen() { + HashMap map = new HashMap(); + map.put("flag", "1"); + map.put("in_area_id", "('B1','B2')"); + JSONArray rows = WQL.getWO("ST_IVT_HOTPOINTIVT").addParamMap(map).process().getResultJSONArray(0); + JSONArray new_rows = new JSONArray(); + for (int i = 0; i < rows.size(); i++) { + JSONObject row = rows.getJSONObject(i); + Object redisTemp = redisUtils.hget(row.getString("point_code"), "temperature"); + String temperature = "未知"; + if (redisTemp!=null){ + temperature = String.valueOf(redisTemp); + } + Object redislastTime = redisUtils.hget(row.getString("point_code"), "temperature"); + String lastTime = "未知"; + if (redislastTime!=null){ + lastTime = String.valueOf(redislastTime); + } + row.put("temperature", temperature); + row.put("c", lastTime); + new_rows.add(row); + } + return new_rows; + } + @Override public Map queryAll(Map whereJson, Pageable page) { //获取人员对应的区域