add:增加烘箱冷却区看板
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
package org.nl.wms.pdm.ivt.rest;
|
package org.nl.wms.pdm.ivt.rest;
|
||||||
|
|
||||||
|
|
||||||
|
import cn.dev33.satoken.annotation.SaIgnore;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -79,4 +80,10 @@ public class CoolPointIvtController {
|
|||||||
return new ResponseEntity<>(HttpStatus.OK);
|
return new ResponseEntity<>(HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("B1screen")
|
||||||
|
@SaIgnore
|
||||||
|
public ResponseEntity<Object> B1screen() {
|
||||||
|
return new ResponseEntity<>(coolpointivtService.B1screen(), HttpStatus.OK);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package org.nl.wms.pdm.ivt.rest;
|
package org.nl.wms.pdm.ivt.rest;
|
||||||
|
|
||||||
|
|
||||||
|
import cn.dev33.satoken.annotation.SaIgnore;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -77,4 +78,10 @@ public class HotPointIvtController {
|
|||||||
hotpointivtService.uploadMes(form);
|
hotpointivtService.uploadMes(form);
|
||||||
return new ResponseEntity<>(HttpStatus.OK);
|
return new ResponseEntity<>(HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("B1screen")
|
||||||
|
@SaIgnore
|
||||||
|
public ResponseEntity<Object> B1screen() {
|
||||||
|
return new ResponseEntity<>(hotpointivtService.B1screen(), HttpStatus.OK);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.nl.wms.pdm.ivt.service;
|
package org.nl.wms.pdm.ivt.service;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson.JSONArray;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import org.nl.wms.pdm.ivt.service.dto.CoolPointIvtDto;
|
import org.nl.wms.pdm.ivt.service.dto.CoolPointIvtDto;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
@@ -79,4 +80,5 @@ public interface CoolPointIvtService {
|
|||||||
Map<String, Object> coolRegionIOQueryAll(Map whereJson, Pageable page);
|
Map<String, Object> coolRegionIOQueryAll(Map whereJson, Pageable page);
|
||||||
|
|
||||||
void uploadMes(JSONObject form);
|
void uploadMes(JSONObject form);
|
||||||
}
|
|
||||||
|
JSONArray B1screen();}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.nl.wms.pdm.ivt.service;
|
package org.nl.wms.pdm.ivt.service;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson.JSONArray;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import org.nl.wms.pdm.ivt.service.dto.HotPointIvtDto;
|
import org.nl.wms.pdm.ivt.service.dto.HotPointIvtDto;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
@@ -79,5 +80,6 @@ public interface HotPointIvtService {
|
|||||||
Map<String, Object> taskDtlQuery(Map whereJson, Pageable page);
|
Map<String, Object> taskDtlQuery(Map whereJson, Pageable page);
|
||||||
|
|
||||||
void uploadMes(JSONObject form);
|
void uploadMes(JSONObject form);
|
||||||
|
JSONArray B1screen();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,6 +41,17 @@ import java.util.Map;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
public class CoolPointIvtServiceImpl implements CoolPointIvtService {
|
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
|
@Override
|
||||||
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
|
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
|
||||||
|
|
||||||
|
|||||||
@@ -45,6 +45,32 @@ public class HotPointIvtServiceImpl implements HotPointIvtService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private RedisUtils redisUtils;
|
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
|
@Override
|
||||||
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
|
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
|
||||||
//获取人员对应的区域
|
//获取人员对应的区域
|
||||||
|
|||||||
Reference in New Issue
Block a user