常规更新

src/main/java/com/usky/service/top/TopServcieImpl.java

@@ -50,7 +50,12 @@ public class TopServcieImpl extends BaseDaoImpl implements TopServcie {
         List<TbDeviceAlarmsDTO> list = getSession().createSQLQuery("SELECT id,dev_id as devId,register_id AS registerId,device_name AS deviceName,device_type AS deviceType,devcie_model AS devcieModel,property,serial,`value`,`status`,create_time AS createTime ,time_stamp AS `timeStamp` FROM tb_device_alarms WHERE date_sub(curdate(), interval 7 day) < date(create_time) order by id ASC")
                 .setResultTransformer(Transformers.aliasToBean(TbDeviceAlarmsDTO.class)).list();
         //根据时间分组
-        Map<String, List<TbDeviceAlarmsDTO>> collect = list.stream().collect(Collectors.groupingBy(TbDeviceAlarmsDTO::getCreateTime));
+    //    Map<String, List<TbDeviceAlarmsDTO>> collect = list.stream().collect(Collectors.groupingBy(TbDeviceAlarmsDTO::getCreateTime));
+   //     Map<LocalDate, List> modelMap = modelVOList.stream().collect(Collectors.groupingBy(Model::getGroupTime,
+
+     //   LinkedHashMap::new, Collectors.toList()));
+        Map<String, List<TbDeviceAlarmsDTO>> collect = list.stream().collect(Collectors.groupingBy(TbDeviceAlarmsDTO::getCreateTime, LinkedHashMap::new, Collectors.toList()));
+
         List<Object> resultList = new ArrayList<>();
         Set<String> strings = collect.keySet();
         for (String string : strings) {
@@ -100,7 +105,7 @@ public class TopServcieImpl extends BaseDaoImpl implements TopServcie {
                 "FROM\n" +
                 "\ttb_device_info t \n" +
                 "WHERE\n" +
-                "\tt.serial = '75' \n" +
+                "\tt.serial = '67' \n" +
                 "\tAND date_sub( curdate(), INTERVAL 7 DAY ) < date( create_time ) ");
 
         sb.append(" AND  dev_id='" + devId + "' GROUP BY date( create_time )");