|
@@ -67,8 +67,6 @@ public class ShowDataController {
|
|
|
List<Map<String, Object>> snData = moyuJdbcTemplate.queryForList(sql);
|
|
|
List<String> snList = new ArrayList();
|
|
|
snData.forEach(p -> snList.add(p.get("qrcode").toString()));
|
|
|
- snList.add("PK504B00100004161");
|
|
|
- snList.add("PK504B00100004260");
|
|
|
String snString = "\'" + String.join("\',\'", snList) + "\'";
|
|
|
Map res = new HashMap<String, String>();
|
|
|
res.put("time", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
|
|
@@ -117,7 +115,7 @@ public class ShowDataController {
|
|
|
String snString = this.getSn().get("snString").toString();
|
|
|
Map<String, Object> res = new HashMap<>();
|
|
|
String sql = "select product_id as sn, start_time as time,TIMESTAMPDIFF(hour,start_time,now()) as drua, level, info, advice,Batpos from all_fault_info where end_time = '0000-00-00 00:00:00' " +
|
|
|
- "and code not in (58,59) and product_id in (%s) and level >= 1";
|
|
|
+ "and code not in (58,59) and product_id in (%s) and level >= 4";
|
|
|
List<Map<String, Object>> lowSocData;
|
|
|
|
|
|
try {
|