电子屏

于紫祥_1901

2020-12-14 782e84d68779471c0640584678d4c4df3afa80a2

 src/main/java/com/moral/controller/ScreenController.java

@@ -727,7 +727,7 @@
             */
            /*改动范围start-------------------------------------------------------------------------*/
            list.remove(0);
            if (list.size() == 23) {
            //if (list.size() == 23) {
                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
                //获取全格式时间yyyy-MM-dd HH:mm:ss
@@ -745,7 +745,7 @@
                    datas.put("time",time1);
                    list.add(datas);
                }
            }
            //}
            /*改动范围end-------------------------------------------------------------------------*/


@@ -2987,4 +2987,11 @@
        }
        return new ResultBean<List<Map<String,Object>>>(rList);
    }

    @PostMapping("byAccountGetDevices")
    public List<Device> byAccountGetDevices(@RequestBody Map<String, Object> parameters) {
        String id =parameters.get("id").toString();
        List<Device> devicesList = deviceService.getDevicesByAccountId(id);
        return devicesList;
    }
}