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

# Conflicts:
#	target/classes/main/resources/mapper/MouldEquipmentMapper.xml
#	target/classes/main/resources/mapper/MouldMapper.xml

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

@@ -32,7 +32,20 @@ public class MouldHistoryServiceImpl extends ServiceImpl<MouldHistoryMapper, Mou
     @Override
     public HttpRespMsg getOpeningAndClosingTimesChart(String equipmentNo, String time) {
         HttpRespMsg msg = new HttpRespMsg();
+        Map <String,Integer> map = new HashMap<>();
+        map.put("00:00-01:00",0);
+        map.put("01:00-02:00",0);
+        map.put("02:00-03:00",0);
+        map.put("03:00-04:00",0);
+        map.put("0:00-01:00",0);
+        map.put("00:00-01:00",0);
+        map.put("00:00-01:00",0);
        List<MouldHistoryVO> list =  mouldHistoryMapper.selectOpeningAndClosingTimesChart(equipmentNo,time);
+        list.stream().forEach(x ->{
+            if(Integer.parseInt(x.getTime()) <= 2){
+
+            }
+        });
         msg.data=list;
         return msg;
     }

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

@@ -0,0 +1,25 @@
+package com.hssx.cloudmodel.util;
+
+import com.hssx.cloudmodel.entity.MouldHistory;
+import com.hssx.cloudmodel.entity.vo.MouldHistoryVO;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 10 - 12 16:34
+ * Description:<描述>
+ * Version: 1.0
+ */
+public class TimeAndCountUtil {
+    Set<MouldHistoryVO> set = new HashSet<>();
+    {
+        for(int i=0 ;i<=23 ;i++){
+            MouldHistoryVO vo = new MouldHistoryVO();
+            String iStr = i<10 ? ("0"+i):i+"";
+            String iStrAfterOne = (i+1)<10 ? ("0"+i):i+"";
+            vo.setTime(iStr+":00-"+iStrAfterOne+":00");
+        }
+    }
+}

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

@@ -55,7 +55,7 @@
     </sql>
 
     <select id="selectOpeningAndClosingTimesChart" resultMap="BaseResultMapVO">
-      SELECT  DATE_FORMAT(indate,'%H:%i:%s') time , run_cnt FROM `mould_history`
+      SELECT  DATE_FORMAT(indate,'%H') time , run_cnt FROM `mould_history`
        WHERE `equipment_no`= #{equipmentNo} AND DATE_FORMAT(indate,'%Y-%m-%d') = #{time}
        ORDER BY indate
     </select>