root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:增加烘箱冷却区看板

Browse Source
This commit is contained in:
zhangzq
2025-05-25 21:07:15 +08:00
parent 0b2532edbd
commit 5467a7514c
6 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/CoolPointIvtController.java
View File

@@ -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<Object> B1screen() {
return new ResponseEntity<>(coolpointivtService.B1screen(), HttpStatus.OK);
}
}

7
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/HotPointIvtController.java
View File

@@ -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<Object> B1screen() {
return new ResponseEntity<>(hotpointivtService.B1screen(), HttpStatus.OK);
}
}

4
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/CoolPointIvtService.java
View File

@@ -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<String, Object> coolRegionIOQueryAll(Map whereJson, Pageable page);
void uploadMes(JSONObject form);
}
JSONArray B1screen();}

4
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/HotPointIvtService.java
View File

@@ -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<String, Object> taskDtlQuery(Map whereJson, Pageable page);
void uploadMes(JSONObject form);
JSONArray B1screen();
}
}

11
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java
View File

@@ -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<String, Object> queryAll(Map whereJson, Pageable page) {

26
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java
View File

@@ -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<String, Object> queryAll(Map whereJson, Pageable page) {
//获取人员对应的区域