Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-socket/src/com/js/kbt/socket/UserHandler.java

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldHistoryServiceImpl.java

@@ -139,6 +139,7 @@ public class MouldHistoryServiceImpl extends ServiceImpl<MouldHistoryMapper, Mou
         Map<String, List<MouldHistoryVO>> mapList = list.stream().collect(Collectors.groupingBy(MouldHistoryVO::getTime));
         MouldHistoryTimeVO vo = new MouldHistoryTimeVO();
         for(Map.Entry<String, List<MouldHistoryVO>> entry:mapList.entrySet()){
+            System.out.println("-----"+entry);
             vo.setMinCycle(entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
             vo.setMaxCycle(entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt());
             vo.setAvgCycle((int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/VnoticeUserServiceImpl.java

@@ -52,7 +52,7 @@ public class VnoticeUserServiceImpl extends ServiceImpl<VnoticeUserMapper, Vnoti
             //加载全部
             System.out.println(page.getPageNum()+" "+page.getPageSize());
             PageHelper.startPage(page.getPageNum(), page.getPageSize());
-            list = vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("notice_type", Constant.APPROVEL_TYPE).orderByDesc("id"));
+            list = vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("notice_type", Constant.APPROVEL_TYPE).orderByDesc("id").last(""));
             long count = list.stream().filter(x -> x.getIsRead() == 0).count();
             PageInfo<VnoticeUser> pageInfo = new PageInfo<VnoticeUser>(list);
             map.put("approvelList", pageInfo);