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

# Conflicts:
#	website/src/main/resources/templates/index.html

cloud-model/src/main/java/com/hssx/cloudmodel/entity/vo/MouldHistoryTimeVO.java

@@ -14,7 +14,8 @@ public class MouldHistoryTimeVO extends MouldHistoryTime {
     private String startTime;
     private String endTime;
     private String time;//返回给前端的年月日字符串（2019-01-02）
-    private Double avgCycle;
-    private Integer minCycle;
-    private Integer maxCycle;
+    private Integer avgCycle = 0;
+    private Integer minCycle = 0;
+    private Integer maxCycle = 0;
+    private Integer theoryCycle = 0;
 }

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

@@ -238,7 +238,7 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
                     newsNotice.setNoticeType(Constant.EMERGENCY_TYPE);
                     newsNotice.setProjectId(project.getId());
                     newsNotice.setProjectName(project.getProjectName() + "-" + mould.getModelName());
-//                    newsNotice.setRefId(mould.getId());
+                    newsNotice.setRefId(mould.getId());
                     newsNotice.setContent(mouldEquipment.getEquipmentNo() + "-" + Constant.EMERGENCY_ELECTRICITY_NOTICE);
                     newsNoticeMapper.insert(newsNotice);
                     for (User u : users) {

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

@@ -70,7 +70,6 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
 
     @Override
     public HttpRespMsg addFile(UserVO userVO, Integer blongType, MultipartFile file, MultipartFile file2, String path) {
-        System.out.println("file2-----"+file2.getOriginalFilename());
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         Mould mould = mouldMapper.selectById(userVO.getMouldId());

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

@@ -41,7 +41,7 @@ public class MouldHistoryServiceImpl extends ServiceImpl<MouldHistoryMapper, Mou
         List<MouldCycleRuntime> list = mouldCycleRuntimeMapper.selectList(new QueryWrapper<MouldCycleRuntime>().eq("equipment_no", equipmentNo).eq("date_str",time));
 //        List<MouldHistoryVO> list =  mouldHistoryMapper.selectOpeningAndClosingTimesChart(equipmentNo,time);
 //        Set<MouldHistoryVO> set = TimeAndCountUtil.getSet();
-        Map<String, Integer> map = TimeAndCountUtil.getMap();
+//        Map<String, Integer> map = TimeAndCountUtil.getMap();
 //        Integer count = 0;
 //        Map<String, List<MouldHistoryVO>> mapList = list.stream().collect(Collectors.groupingBy(MouldHistoryVO::getTime));
 //        for(Map.Entry<String, List<MouldHistoryVO>> entry:mapList.entrySet()){
@@ -125,6 +125,7 @@ public class MouldHistoryServiceImpl extends ServiceImpl<MouldHistoryMapper, Mou
 //                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
 //                        (oleValue, newValue) -> oleValue, LinkedHashMap::new));
 //        System.out.println("排序后的map===>"+result);
+        list = list.stream().sorted(Comparator.comparing(MouldCycleRuntime::getTimeSlot)).collect(Collectors.toList());
         msg.data=list;
         return msg;
     }
@@ -132,64 +133,68 @@ public class MouldHistoryServiceImpl extends ServiceImpl<MouldHistoryMapper, Mou
     @Override
     public HttpRespMsg openingAndClosingTimesChartCycle(String equipmentNo,String time) {
         HttpRespMsg msg = new HttpRespMsg();
-        Map<String, Integer> map = TimeAndCountUtil.getMap();
-        List<MouldHistoryVO> list = mouldHistoryTimeMapper.getOpeningAndClosingTimesChartCycle(equipmentNo,time);
+        Map<String,MouldHistoryTimeVO> map = TimeAndCountUtil.getMap();
+        List<MouldHistoryVO> list = mouldHistoryTimeMapper.getOpeningAndClosingTimesChartCycle(time,equipmentNo);
         Integer count = 0;
         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()){
+            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());
+            vo.setTheoryCycle(40000);
             if("00".equals(entry.getKey())){
-                map.put("00:00-01:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble()
-                                );
+                map.put("00:00-01:00",vo);
             }else if("01".equals(entry.getKey())){
-                map.put("01:00-02:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("01:00-02:00",vo);
             }else if("02".equals(entry.getKey())){
-                map.put("02:00-03:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("02:00-03:00",vo);
             }else if("03".equals(entry.getKey())){
-                map.put("03:00-04:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("03:00-04:00",vo);
             }else if("04".equals(entry.getKey())){
-                map.put("04:00-05:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("04:00-05:00",vo);
             }else if("05".equals(entry.getKey())){
-                map.put("05:00-06:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("05:00-06:00",vo);
             }else if("06".equals(entry.getKey())){
-                map.put("06:00-07:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("06:00-07:00",vo);
             }else if("07".equals(entry.getKey())){
-                map.put("07:00-08:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("07:00-08:00",vo);
             }else if("08".equals(entry.getKey())){
-                map.put("08:00-09:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("08:00-09:00",vo);
             }else if("09".equals(entry.getKey())){
-                map.put("09:00-10:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("09:00-10:00",vo);
             }else if("10".equals(entry.getKey())){
-                map.put("10:00-11:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("10:00-11:00",vo);
             }else if("11".equals(entry.getKey())){
-                map.put("11:00-12:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("11:00-12:00",vo);
             }else if("12".equals(entry.getKey())){
-                map.put("12:00-13:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("12:00-13:00",vo);
             }else if("13".equals(entry.getKey())){
-                map.put("13:00-14:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("13:00-14:00",vo);
             }else if("14".equals(entry.getKey())){
-                map.put("14:00-15:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("14:00-15:00",vo);
             }else if("15".equals(entry.getKey())){
-                map.put("15:00-16:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("15:00-16:00",vo);
             }else if("16".equals(entry.getKey())){
-                map.put("16:00-17:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("16:00-17:00",vo);
             }else if("17".equals(entry.getKey())){
-                map.put("17:00-18:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("17:00-18:00",vo);
             }else if("18".equals(entry.getKey())){
-                map.put("18:00-19:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("18:00-19:00",vo);
             }else if("19".equals(entry.getKey())){
-                map.put("19:00-20:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("19:00-20:00",vo);
             }else if("20".equals(entry.getKey())){
-                map.put("20:00-21:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("20:00-21:00",vo);
             }else if("21".equals(entry.getKey())){
-                map.put("21:00-22:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("21:00-22:00",vo);
             }else if("22".equals(entry.getKey())){
-                map.put("22:00-23:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("22:00-23:00",vo);
             }else if("23".equals(entry.getKey())){
-                map.put("23:00-24:00",(int)entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).average().getAsDouble());
+                map.put("23:00-24:00",vo);
             }
         }
         System.out.println("原来的map===>"+map);
-        Map<String, Integer> result = map.entrySet().stream()
+        Map<String, MouldHistoryTimeVO> result = map.entrySet().stream()
                 .sorted(Map.Entry.comparingByKey())
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
                         (oleValue, newValue) -> oleValue, LinkedHashMap::new));

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

@@ -50,6 +50,7 @@ public class VnoticeUserServiceImpl extends ServiceImpl<VnoticeUserMapper, Vnoti
         if (user != null) {
             Map<String, Object> map = new HashMap<>();
             //加载全部
+            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"));
             long count = list.stream().filter(x -> x.getIsRead() == 0).count();
@@ -57,16 +58,16 @@ public class VnoticeUserServiceImpl extends ServiceImpl<VnoticeUserMapper, Vnoti
             map.put("approvelList", pageInfo);
             map.put("isNotReadCount", count);
             mapList.add(map);
-            list = vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("notice_type",Constant.MAINTAIN_TYPE).orderByDesc("id"));
+            List<VnoticeUser> list1 = vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("notice_type",Constant.MAINTAIN_TYPE).orderByDesc("id"));
             count = list.stream().filter(x -> x.getIsRead() == 0).count();
-            PageInfo<VnoticeUser> pageInfo1 = new PageInfo<VnoticeUser>(list);
+            PageInfo<VnoticeUser> pageInfo1 = new PageInfo<VnoticeUser>(list1);
             Map<String, Object> map1 = new HashMap<>();
             map1.put("matainList", pageInfo1);
             map1.put("isNotReadCount", count);
             mapList.add(map1);
-            list = vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("notice_type",Constant.EMERGENCY_TYPE).orderByDesc("id"));
+            List<VnoticeUser> list2 = vnoticeUserMapper.selectList(new QueryWrapper<VnoticeUser>().eq("user_id", user.getId()).eq("notice_type",Constant.EMERGENCY_TYPE).orderByDesc("id"));
             count = list.stream().filter(x -> x.getIsRead() == 0).count();
-            PageInfo<VnoticeUser> pageInfo2 = new PageInfo<VnoticeUser>(list);
+            PageInfo<VnoticeUser> pageInfo2 = new PageInfo<VnoticeUser>(list2);
             Map<String, Object> map2 = new HashMap<>();
             map2.put("emergencyList", pageInfo2);
             map2.put("isNotReadCount", count);

cloud-model/src/main/java/com/hssx/cloudmodel/util/TimeAndCountUtil.java

@@ -1,4 +1,6 @@
 package com.hssx.cloudmodel.util;
+import com.hssx.cloudmodel.entity.MouldHistoryTime;
+import com.hssx.cloudmodel.entity.vo.MouldHistoryTimeVO;
 import com.hssx.cloudmodel.entity.vo.MouldHistoryVO;
 
 import java.sql.SQLOutput;
@@ -27,14 +29,14 @@ public class TimeAndCountUtil {
         }
         return set;
     }
-    public static Map<String,Integer> getMap(){
-        Map<String,Integer> map = new HashMap<>();
+    public static Map<String,MouldHistoryTimeVO> getMap(){
+        Map<String,MouldHistoryTimeVO> map = new HashMap<>();
         for(int i=0 ;i<=23 ;i++){
             MouldHistoryVO vo = new MouldHistoryVO();
             String iStr = i<10 ? ("0"+i):i+"";
             int i1 = i+1;
             String iStrAfterOne = (i1)<10 ? ("0"+i1):i1+"";
-            map.put(iStr+":00-"+iStrAfterOne+":00",0);
+            map.put(iStr+":00-"+iStrAfterOne+":00",new MouldHistoryTimeVO());
         }
         return map;
     }

cloud-model/src/main/resources/mapper/MouldHistoryTimeMapper.xml

@@ -30,7 +30,7 @@
             <if test="time != null and time != ''">
                AND DATE_FORMAT(open_time,'%Y-%m-%d') = #{time}
             </if>
-            and BETWEEN 30000 AND 50000
+            and time_cost BETWEEN 30000 AND 50000
         </where>
         ORDER BY open_time
     </select>

target/classes/main/resources/application.properties

@@ -13,7 +13,7 @@ spring.thymeleaf.jackson.date-format=yyyy-MM-dd HH:mm:ss
 # ####################################################################################################
 # Êý¾ÝÔ´ÅäÖÃ
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://118.190.47.230:3306/new_cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_test?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=p011430seya1026
 #spring.datasource.druid.test-on-borrow=true