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

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldCycleRuntimeController.java

@@ -0,0 +1,21 @@
+package com.hssx.cloudmodel.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-28
+ */
+@RestController
+@RequestMapping("/mould-cycle-runtime")
+public class MouldCycleRuntimeController {
+
+}
+

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldHistoryController.java

@@ -44,17 +44,15 @@ public class MouldHistoryController {
 
     /**
      * 获取云模盒的每日开合次数周期 (时间/周期)
-     * @param mouldHistoryTimeVO
-     *  参数：startTime 开始时间 2019-01-02
-     *        endTime 截止时间 2019-01-03
+     *  参数：time 时间点 如：2019-02-15
      *        equipmentNo 设备编号
      * @return
      */
     @ApiOperation("获取云模盒的每日开合次数周期 (时间/周期)")
     @RequestMapping("/openingAndClosingTimesChartCycle")
     @ResponseBody
-    public HttpRespMsg openingAndClosingTimesChartCycle(MouldHistoryTimeVO mouldHistoryTimeVO){
-        HttpRespMsg msg = mouldHistoryService.openingAndClosingTimesChartCycle(mouldHistoryTimeVO);
+    public HttpRespMsg openingAndClosingTimesChartCycle(String equipmentNo,String time){
+        HttpRespMsg msg = mouldHistoryService.openingAndClosingTimesChartCycle(equipmentNo, time);
         return msg;
     }
 

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

@@ -0,0 +1,107 @@
+package com.hssx.cloudmodel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-28
+ */
+public class MouldCycleRuntime extends Model<MouldCycleRuntime> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 周期运行次数表主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 运行次数
+     */
+    @TableField("runtime")
+    private Integer runtime;
+
+    /**
+     * 时间段如00:00-01:00
+     */
+    @TableField("time_slot")
+    private String timeSlot;
+
+    /**
+     * 日期字符串（开合）
+     */
+    @TableField("date_str")
+    private String dateStr;
+
+    /**
+     * 云模盒编号ccid
+     */
+    @TableField("equipment_no")
+    private String equipmentNo;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getRuntime() {
+        return runtime;
+    }
+
+    public void setRuntime(Integer runtime) {
+        this.runtime = runtime;
+    }
+
+    public String getTimeSlot() {
+        return timeSlot;
+    }
+
+    public void setTimeSlot(String timeSlot) {
+        this.timeSlot = timeSlot;
+    }
+
+    public String getDateStr() {
+        return dateStr;
+    }
+
+    public void setDateStr(String dateStr) {
+        this.dateStr = dateStr;
+    }
+
+    public String getEquipmentNo() {
+        return equipmentNo;
+    }
+
+    public void setEquipmentNo(String equipmentNo) {
+        this.equipmentNo = equipmentNo;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "MouldCycleRuntime{" +
+        "id=" + id +
+        ", runtime=" + runtime +
+        ", timeSlot=" + timeSlot +
+        ", dateStr=" + dateStr +
+        ", equipmentNo=" + equipmentNo +
+        "}";
+    }
+}

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

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
 
 /**
@@ -16,7 +14,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-10-10
+ * @since 2019-10-28
  */
 @TableName("tb_mould_equipment")
 public class MouldEquipment extends Model<MouldEquipment> {
@@ -39,14 +37,12 @@ public class MouldEquipment extends Model<MouldEquipment> {
      * 启动时间
      */
     @TableField("start_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
 
     /**
      * 结束时间
      */
     @TableField("end_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
     /**
@@ -74,7 +70,7 @@ public class MouldEquipment extends Model<MouldEquipment> {
     private Integer isUse;
 
     /**
-     * 告警电量（默认30%）
+     * 告警电量
      */
     @TableField("hill_number")
     private String hillNumber;
@@ -92,7 +88,7 @@ public class MouldEquipment extends Model<MouldEquipment> {
     private Double lat;
 
     /**
-     * 告警模盒温度（默认80度）
+     * 告警模盒温度
      */
     @TableField("temperature")
     private Integer temperature;
@@ -104,7 +100,7 @@ public class MouldEquipment extends Model<MouldEquipment> {
     private String agent;
 
     /**
-     * 状态,0-正常，1-温度过高，2-电量过低,3-温度过高且电量低
+     * 状态,0-正常，1-温度过高，2-电量过低,3-安装被拆
      */
     @TableField("stage")
     private Integer stage;
@@ -115,6 +111,18 @@ public class MouldEquipment extends Model<MouldEquipment> {
     @TableField("sim")
     private String sim;
 
+    /**
+     * 当前电量
+     */
+    @TableField("curhill_number")
+    private String curhillNumber;
+
+    /**
+     * 当前温度
+     */
+    @TableField("curtemperature")
+    private Integer curtemperature;
+
 
     public Integer getId() {
         return id;
@@ -236,6 +244,22 @@ public class MouldEquipment extends Model<MouldEquipment> {
         this.sim = sim;
     }
 
+    public String getCurhillNumber() {
+        return curhillNumber;
+    }
+
+    public void setCurhillNumber(String curhillNumber) {
+        this.curhillNumber = curhillNumber;
+    }
+
+    public Integer getCurtemperature() {
+        return curtemperature;
+    }
+
+    public void setCurtemperature(Integer curtemperature) {
+        this.curtemperature = curtemperature;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -259,6 +283,8 @@ public class MouldEquipment extends Model<MouldEquipment> {
         ", agent=" + agent +
         ", stage=" + stage +
         ", sim=" + sim +
+        ", curhillNumber=" + curhillNumber +
+        ", curtemperature=" + curtemperature +
         "}";
     }
 }

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/entity/vo/MouldHistoryVO.java

@@ -12,4 +12,5 @@ import lombok.Data;
 @Data
 public class MouldHistoryVO extends MouldHistory {
     private String time;
+    private Integer cycle;
 }

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/MouldCycleRuntimeMapper.java

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.mapper;
+
+import com.hssx.cloudmodel.entity.MouldCycleRuntime;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-28
+ */
+public interface MouldCycleRuntimeMapper extends BaseMapper<MouldCycleRuntime> {
+
+}

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/MouldHistoryTimeMapper.java

@@ -3,6 +3,7 @@ package com.hssx.cloudmodel.mapper;
 import com.hssx.cloudmodel.entity.MouldHistoryTime;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hssx.cloudmodel.entity.vo.MouldHistoryTimeVO;
+import com.hssx.cloudmodel.entity.vo.MouldHistoryVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -16,6 +17,6 @@ import java.util.List;
  * @since 2019-10-12
  */
 public interface MouldHistoryTimeMapper extends BaseMapper<MouldHistoryTime> {
-    List<MouldHistoryTimeVO> getOpeningAndClosingTimesChartCycle(@Param("startTime") String startTime
-    ,@Param("endTime")String endTime,@Param("equipmentNo")String equipmentNo);
+
+    List<MouldHistoryVO> getOpeningAndClosingTimesChartCycle(@Param("time")String time,@Param("equipmentNo")String equipmentNo);
 }

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

@@ -0,0 +1,16 @@
+package com.hssx.cloudmodel.service;
+
+import com.hssx.cloudmodel.entity.MouldCycleRuntime;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-28
+ */
+public interface MouldCycleRuntimeService extends IService<MouldCycleRuntime> {
+
+}

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

@@ -17,5 +17,5 @@ public interface MouldHistoryService extends IService<MouldHistory> {
 
     HttpRespMsg getOpeningAndClosingTimesChart(String equipmentNo, String time);
 
-    HttpRespMsg openingAndClosingTimesChartCycle(MouldHistoryTimeVO mouldHistoryTimeVO);
+    HttpRespMsg openingAndClosingTimesChartCycle(String equipmentNo,String time);
 }

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

@@ -0,0 +1,20 @@
+package com.hssx.cloudmodel.service.impl;
+
+import com.hssx.cloudmodel.entity.MouldCycleRuntime;
+import com.hssx.cloudmodel.mapper.MouldCycleRuntimeMapper;
+import com.hssx.cloudmodel.service.MouldCycleRuntimeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-28
+ */
+@Service
+public class MouldCycleRuntimeServiceImpl extends ServiceImpl<MouldCycleRuntimeMapper, MouldCycleRuntime> implements MouldCycleRuntimeService {
+
+}

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

@@ -1,9 +1,12 @@
 package com.hssx.cloudmodel.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.MouldCycleRuntime;
 import com.hssx.cloudmodel.entity.MouldHistory;
 import com.hssx.cloudmodel.entity.MouldHistoryTime;
 import com.hssx.cloudmodel.entity.vo.MouldHistoryTimeVO;
 import com.hssx.cloudmodel.entity.vo.MouldHistoryVO;
+import com.hssx.cloudmodel.mapper.MouldCycleRuntimeMapper;
 import com.hssx.cloudmodel.mapper.MouldHistoryMapper;
 import com.hssx.cloudmodel.mapper.MouldHistoryTimeMapper;
 import com.hssx.cloudmodel.service.MouldHistoryService;
@@ -30,125 +33,192 @@ public class MouldHistoryServiceImpl extends ServiceImpl<MouldHistoryMapper, Mou
     private MouldHistoryMapper mouldHistoryMapper;
     @Resource
     private MouldHistoryTimeMapper mouldHistoryTimeMapper;
+    @Resource
+    private MouldCycleRuntimeMapper mouldCycleRuntimeMapper;
     @Override
     public HttpRespMsg getOpeningAndClosingTimesChart(String equipmentNo, String time) {
         HttpRespMsg msg = new HttpRespMsg();
-       List<MouldHistoryVO> list =  mouldHistoryMapper.selectOpeningAndClosingTimesChart(equipmentNo,time);
-        Set<MouldHistoryVO> set = TimeAndCountUtil.getSet();
-        Map<String, Integer> map = TimeAndCountUtil.getMap();
+        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();
+//        Integer count = 0;
+//        Map<String, List<MouldHistoryVO>> mapList = list.stream().collect(Collectors.groupingBy(MouldHistoryVO::getTime));
+//        for(Map.Entry<String, List<MouldHistoryVO>> entry:mapList.entrySet()){
+//            if("00".equals(entry.getKey())){
+//                map.put("00:00-01:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("01".equals(entry.getKey())){
+//                map.put("01:00-02:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("02".equals(entry.getKey())){
+//                map.put("02:00-03:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("03".equals(entry.getKey())){
+//                map.put("03:00-04:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("04".equals(entry.getKey())){
+//                map.put("04:00-05:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("05".equals(entry.getKey())){
+//                map.put("05:00-06:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("06".equals(entry.getKey())){
+//                map.put("06:00-07:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("07".equals(entry.getKey())){
+//                map.put("07:00-08:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("08".equals(entry.getKey())){
+//                map.put("08:00-09:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("09".equals(entry.getKey())){
+//                map.put("09:00-10:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("10".equals(entry.getKey())){
+//                map.put("10:00-11:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("11".equals(entry.getKey())){
+//                map.put("11:00-12:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("12".equals(entry.getKey())){
+//                map.put("12:00-13:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("13".equals(entry.getKey())){
+//                map.put("13:00-14:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("14".equals(entry.getKey())){
+//                map.put("14:00-15:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("15".equals(entry.getKey())){
+//                map.put("15:00-16:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("16".equals(entry.getKey())){
+//                map.put("16:00-17:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("17".equals(entry.getKey())){
+//                map.put("17:00-18:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("18".equals(entry.getKey())){
+//                map.put("18:00-19:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("19".equals(entry.getKey())){
+//                map.put("19:00-20:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("20".equals(entry.getKey())){
+//                map.put("20:00-21:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("21".equals(entry.getKey())){
+//                map.put("21:00-22:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("22".equals(entry.getKey())){
+//                map.put("22:00-23:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }else if("23".equals(entry.getKey())){
+//                map.put("23:00-24:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
+//                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+//            }
+//        }
+//        System.out.println("原来的map===>"+map);
+//        Map<String, Integer> result = map.entrySet().stream()
+//                .sorted(Map.Entry.comparingByKey())
+//                .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;
+    }
+
+    @Override
+    public HttpRespMsg openingAndClosingTimesChartCycle(String equipmentNo,String time) {
+        HttpRespMsg msg = new HttpRespMsg();
+        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",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("00:00-01:00",vo);
             }else if("01".equals(entry.getKey())){
-                map.put("01:00-02:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("01:00-02:00",vo);
             }else if("02".equals(entry.getKey())){
-                map.put("02:00-03:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("02:00-03:00",vo);
             }else if("03".equals(entry.getKey())){
-                map.put("03:00-04:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("03:00-04:00",vo);
             }else if("04".equals(entry.getKey())){
-                map.put("04:00-05:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("04:00-05:00",vo);
             }else if("05".equals(entry.getKey())){
-                map.put("05:00-06:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("05:00-06:00",vo);
             }else if("06".equals(entry.getKey())){
-                map.put("06:00-07:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("06:00-07:00",vo);
             }else if("07".equals(entry.getKey())){
-                map.put("07:00-08:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("07:00-08:00",vo);
             }else if("08".equals(entry.getKey())){
-                map.put("08:00-09:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("08:00-09:00",vo);
             }else if("09".equals(entry.getKey())){
-                map.put("09:00-10:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("09:00-10:00",vo);
             }else if("10".equals(entry.getKey())){
-                map.put("10:00-11:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("10:00-11:00",vo);
             }else if("11".equals(entry.getKey())){
-                map.put("11:00-12:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("11:00-12:00",vo);
             }else if("12".equals(entry.getKey())){
-                map.put("12:00-13:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("12:00-13:00",vo);
             }else if("13".equals(entry.getKey())){
-                map.put("13:00-14:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("13:00-14:00",vo);
             }else if("14".equals(entry.getKey())){
-                map.put("14:00-15:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("14:00-15:00",vo);
             }else if("15".equals(entry.getKey())){
-                map.put("15:00-16:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("15:00-16:00",vo);
             }else if("16".equals(entry.getKey())){
-                map.put("16:00-17:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("16:00-17:00",vo);
             }else if("17".equals(entry.getKey())){
-                map.put("17:00-18:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("17:00-18:00",vo);
             }else if("18".equals(entry.getKey())){
-                map.put("18:00-19:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("18:00-19:00",vo);
             }else if("19".equals(entry.getKey())){
-                map.put("19:00-20:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("19:00-20:00",vo);
             }else if("20".equals(entry.getKey())){
-                map.put("20:00-21:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("20:00-21:00",vo);
             }else if("21".equals(entry.getKey())){
-                map.put("21:00-22:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("21:00-22:00",vo);
             }else if("22".equals(entry.getKey())){
-                map.put("22:00-23:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                map.put("22:00-23:00",vo);
             }else if("23".equals(entry.getKey())){
-                map.put("23:00-24:00",entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).max().getAsInt()
-                                - entry.getValue().stream().mapToInt(MouldHistoryVO::getRunCnt).min().getAsInt());
+                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));
         System.out.println("排序后的map===>"+result);
-        msg.data=result;
-        return msg;
-    }
-
-    @Override
-    public HttpRespMsg openingAndClosingTimesChartCycle(MouldHistoryTimeVO mouldHistoryTimeVO) {
-        HttpRespMsg msg = new HttpRespMsg();
-        mouldHistoryTimeVO.setStartTime(mouldHistoryTimeVO.getStartTime());
 //        mouldHistoryTimeVO.setStartTime(mouldHistoryTimeVO.getStartTime()+" 00:00:00");
-        System.out.println(mouldHistoryTimeVO.getStartTime());
 //        mouldHistoryTimeVO.setEndTime(mouldHistoryTimeVO.getEndTime()+" 23:59:59");
-        mouldHistoryTimeVO.setEndTime(mouldHistoryTimeVO.getEndTime());
-        System.out.println(mouldHistoryTimeVO.getEndTime());
-        List<MouldHistoryTimeVO> list  = mouldHistoryTimeMapper.getOpeningAndClosingTimesChartCycle(mouldHistoryTimeVO.getStartTime(),mouldHistoryTimeVO.getEndTime(),mouldHistoryTimeVO.getEquipmentNo());
-        Map<String, List<MouldHistoryTimeVO>> map = list.stream().collect(Collectors.groupingBy(MouldHistoryTimeVO::getTime));
-        List<MouldHistoryTimeVO> resultList = new ArrayList<>();
-        for(Map.Entry<String, List<MouldHistoryTimeVO>> entry : map.entrySet()){
-            String mapKey = entry.getKey();
-            MouldHistoryTimeVO vo = new MouldHistoryTimeVO();
-            vo.setTime(mapKey);
-            List<MouldHistoryTimeVO> mapValue = entry.getValue();
-            vo.setMinCycle(mapValue.stream().mapToInt(MouldHistoryTimeVO::getTimeCost).min().getAsInt());
-            vo.setMinCycle(mapValue.stream().mapToInt(MouldHistoryTimeVO::getTimeCost).max().getAsInt());
-            vo.setAvgCycle(0.1*(mapValue.stream().mapToInt(MouldHistoryTimeVO::getTimeCost).sum()/(mapValue.size()-1)));
-            resultList.add(vo);
-        }
-        System.out.println("原来的resultList===>"+resultList);
-        resultList = resultList.stream().sorted(Comparator.comparing(MouldHistoryTimeVO::getTime)).collect(Collectors.toList());
-        System.out.println("排序后的resultList===>"+resultList);
-        msg.data = resultList;
+//        List<MouldHistoryTimeVO> list  = mouldHistoryTimeMapper.getOpeningAndClosingTimesChartCycle(mouldHistoryTimeVO.getStartTime(),mouldHistoryTimeVO.getEndTime(),mouldHistoryTimeVO.getEquipmentNo());
+//        Map<String, List<MouldHistoryTimeVO>> map = list.stream().collect(Collectors.groupingBy(MouldHistoryTimeVO::getTime));
+//        List<MouldHistoryTimeVO> resultList = new ArrayList<>();
+//        for(Map.Entry<String, List<MouldHistoryTimeVO>> entry : map.entrySet()){
+//            String mapKey = entry.getKey();
+//            MouldHistoryTimeVO vo = new MouldHistoryTimeVO();
+//            vo.setTime(mapKey);
+//            List<MouldHistoryTimeVO> mapValue = entry.getValue();
+//            vo.setMinCycle(mapValue.stream().mapToInt(MouldHistoryTimeVO::getTimeCost).min().getAsInt());
+//            vo.setMinCycle(mapValue.stream().mapToInt(MouldHistoryTimeVO::getTimeCost).max().getAsInt());
+//            vo.setAvgCycle(0.1*(mapValue.stream().mapToInt(MouldHistoryTimeVO::getTimeCost).sum()/(mapValue.size()-1)));
+//            resultList.add(vo);
+//        }
+//        System.out.println("原来的resultList===>"+resultList);
+//        resultList = resultList.stream().sorted(Comparator.comparing(MouldHistoryTimeVO::getTime)).collect(Collectors.toList());
+//        System.out.println("排序后的resultList===>"+resultList);
+//        msg.data = resultList;
+        msg.data = result;
         return msg;
     }
 

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/CodeGenerator.java

@@ -92,7 +92,7 @@ public class CodeGenerator {
 
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://118.190.47.230:3306/cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
+        dsc.setUrl("jdbc:mysql://118.190.47.230:3306/cloud_model_test?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
 //        dsc.setSchemaName("public");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
@@ -204,12 +204,12 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("mould_down_packet");
+        strategy.setInclude("tb_mould_equipment");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);
         //数据库表前缀，不配置这行的话，生成的类会带有T如:TUser,配置后即可将前缀去掉
-//        strategy.setTablePrefix("tb_");
+        strategy.setTablePrefix("tb_");
         mpg.setStrategy(strategy);
 //        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
         mpg.execute();

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/MouldCycleRuntimeMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.MouldCycleRuntimeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.MouldCycleRuntime">
+        <id column="id" property="id" />
+        <result column="runtime" property="runtime" />
+        <result column="time_slot" property="timeSlot" />
+        <result column="date_str" property="dateStr" />
+        <result column="equipment_no" property="equipmentNo" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, runtime, time_slot, date_str, equipment_no
+    </sql>
+
+</mapper>

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

@@ -19,12 +19,15 @@
         <result column="agent" property="agent" />
         <result column="stage" property="stage" />
         <result column="sim" property="sim" />
+        <result column="curhill_number" property="curhillNumber" />
+        <result column="curtemperature" property="curtemperature" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, is_use, hill_number, lng, lat, temperature, agent, stage, sim
+        id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, is_use, hill_number, lng, lat, temperature, agent, stage, sim, curhill_number, curtemperature
     </sql>
+
     <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldEquipmentVO">
         <id column="id" property="id" />
         <result column="equipment_name" property="equipmentName" />
@@ -71,8 +74,8 @@
         select
         tbme.id id, tbme.equipment_no,tbme.equipment_name equipment_name, tbme.start_time start_time, tbme.end_time end_time,tbme.agent,
         tbme.use_life use_life, tbme.belong_company_id belong_company_id, tbme.equipment_no equipment_no,tbme.sim sim,
-        tbme.is_use, (SELECT battery  FROM `mould_history` WHERE tbme.equipment_no = equipment_no ORDER BY indate DESC LIMIT 1) hill_number,
-        (SELECT temperature  FROM `mould_history` WHERE equipment_no = tbme.equipment_no ORDER BY indate DESC LIMIT 1) temperature,tbc.company_name companyName,
+        tbme.is_use, tbme.curhill_number hill_number,
+        tbme.curtemperature temperature,tbc.company_name companyName,
         tbm.model_no modelNo,tbme.temperature alarmDegree,tbme.hill_number alarmBattery,
         tbm.model_name modelName,tbme.stage
         from

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

@@ -11,13 +11,8 @@
         <result column="time_cost" property="timeCost"/>
         <result column="equipment_no" property="equipmentNo"/>
     </resultMap>
-    <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldHistoryTimeVO">
-        <result column="history_id" property="historyId"/>
-        <result column="seq" property="seq"/>
-        <result column="close_time" property="closeTime"/>
-        <result column="open_time" property="openTime"/>
-        <result column="time_cost" property="timeCost"/>
-        <result column="equipment_no" property="equipmentNo"/>
+    <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldHistoryVO">
+        <result column="run_cnt" property="runCnt"/>
         <result column="time" property="time"/>
     </resultMap>
 
@@ -27,17 +22,16 @@
     </sql>
     <select id="getOpeningAndClosingTimesChartCycle" resultMap="BaseResultMapVO">
         select
-        DATE_FORMAT(open_time,'%Y-%m-%d') time ,time_cost
+        DATE_FORMAT(open_time,'%H') time ,time_cost run_cnt
         from
         `mould_history_time`
         <where>
             equipment_no = #{equipmentNo}
-            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                and DATE_FORMAT(open_time,'%Y-%m-%d %H:%i:%s')
-                between concat(#{startTime},' 00:00:00') and
-                concat(#{endTime},' 23:59:59')
+            <if test="time != null and time != ''">
+               AND DATE_FORMAT(open_time,'%Y-%m-%d') = #{time}
             </if>
-            and time_cost &gt; 0
+            and time_cost BETWEEN 30000 AND 50000
         </where>
+        ORDER BY open_time
     </select>
 </mapper>

cloud-socket/src/com/js/kbt/controller/FileController.java

@@ -2,8 +2,13 @@ package com.js.kbt.controller;
 
 import java.io.File;
 import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
 import java.util.UUID;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -13,6 +18,21 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
+import com.js.kbt.mapper.MouldCycleRuntimeMapper;
+import com.js.kbt.mapper.MouldDownPacketMapper;
+import com.js.kbt.mapper.MouldHistoryMapper;
+import com.js.kbt.mapper.MouldHistoryTimeMapper;
+import com.js.kbt.mapper.MouldHodingMapper;
+import com.js.kbt.mapper.TbFactoryMapper;
+import com.js.kbt.mapper.TbMouldEquipmentMapper;
+import com.js.kbt.mapper.TbMouldMapper;
+import com.js.kbt.mapper.TimeCalibrationRecordMapper;
+import com.js.kbt.model.MouldCycleRuntime;
+import com.js.kbt.model.MouldCycleRuntimeExample;
+import com.js.kbt.model.MouldHistory;
+import com.js.kbt.model.MouldHistoryExample;
+import com.js.kbt.model.MouldHistoryTime;
+import com.js.kbt.model.MouldHistoryTimeExample;
 import com.js.kbt.util.Constant;
 
 @Controller
@@ -20,6 +40,25 @@ public class FileController {
 
 	@Autowired
 	private HttpServletRequest request;
+	
+	@Resource
+	private MouldHistoryMapper mouldHistoryMapper;
+	@Resource
+	private MouldHistoryTimeMapper mouldHistoryTimeMapper;
+	@Resource
+	private TbMouldMapper tbMouldMapper;
+	@Resource
+	private TbMouldEquipmentMapper tbMouldEquipmentMapper;
+	@Resource
+	private TbFactoryMapper tbFactoryMapper;
+	@Resource
+	private MouldHodingMapper mouldHodingMapper;
+	@Resource
+	private MouldDownPacketMapper mouldDownPacketMapper;
+	@Resource
+	private TimeCalibrationRecordMapper timeCalibrationRecordMapper;
+	@Resource
+	private MouldCycleRuntimeMapper mouldCycleRuntimeMapper;
 	/**
 	 * 通用上传图片接口
 	 * @param pic
@@ -67,4 +106,100 @@ public class FileController {
 		response.setCharacterEncoding("UTF-8");
 		response.getWriter().println(msg.toJSONStr());
 	}
+	
+	@RequestMapping(value = "update")
+	public void update() throws ParseException{
+		List<MouldHistory> list = mouldHistoryMapper.selectByExample(new MouldHistoryExample());
+		for (MouldHistory mouldHistory : list) {
+			MouldHistoryTimeExample mExp = new MouldHistoryTimeExample();
+			mExp.createCriteria().andHistoryIdEqualTo(mouldHistory.getId());
+			List<MouldHistoryTime> tList = mouldHistoryTimeMapper.selectByExample(mExp);
+			for (MouldHistoryTime mouldHistoryTime : tList) {
+				handleMouldCycleRuntimeLogic(mouldHistoryTime.getOpenTime(),mouldHistory);
+				System.out.println("时间---》"+mouldHistoryTime.getOpenTime());
+			}
+			
+		}
+	}
+	
+	private void handleMouldCycleRuntimeLogic(Date openTime,MouldHistory item) throws ParseException{
+		MouldCycleRuntime mcr = new MouldCycleRuntime();
+		Integer hours = openTime.getHours();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		mcr.setDateStr(sdf.format(openTime));
+		System.out.println("时间字符串----》"+mcr.getDateStr());
+		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:");
+		int housTime = openTime.getHours()-1;
+		openTime.setHours(housTime);
+		String lastOpenTime = sdf1.format(openTime);
+		Date lastOpenTimeDate = sdf1.parse(lastOpenTime+"59:59");
+		System.out.println("lastOpenTime-->"+lastOpenTimeDate);
+		MouldHistoryTimeExample mExp = new MouldHistoryTimeExample();
+		mExp.setOrderByClause("open_time desc limit 1");
+		mExp.createCriteria().andEquipmentNoEqualTo(item.getEquipmentNo()).andOpenTimeLessThanOrEqualTo(lastOpenTimeDate);
+		List<MouldHistoryTime> list = mouldHistoryTimeMapper.selectByExample(mExp);
+		if(list.size()>0){
+			MouldHistory mouldHistory = mouldHistoryMapper.selectByPrimaryKey(list.get(0).getHistoryId());
+			mcr.setEquipmentNo(item.getEquipmentNo());
+			mcr.setRuntime(item.getRunCnt() - mouldHistory.getRunCnt());
+			if(hours==0){
+				mcr.setTimeSlot("00:00-01:00");
+			}else if(hours==1){
+				mcr.setTimeSlot("01:00-02:00");
+			}else if(hours==2){
+				mcr.setTimeSlot("02:00-03:00");
+			}else if(hours==3){
+				mcr.setTimeSlot("03:00-04:00");
+			}else if(hours==4){
+				mcr.setTimeSlot("04:00-05:00");
+			}else if(hours==5){
+				mcr.setTimeSlot("05:00-06:00");
+			}else if(hours==6){
+				mcr.setTimeSlot("06:00-07:00");
+			}else if(hours==7){
+				mcr.setTimeSlot("07:00-08:00");
+			}else if(hours==8){
+				mcr.setTimeSlot("08:00-09:00");
+			}else if(hours==9){
+				mcr.setTimeSlot("09:00-10:00");
+			}else if(hours==10){
+				mcr.setTimeSlot("10:00-11:00");
+			}else if(hours==11){
+				mcr.setTimeSlot("11:00-12:00");
+			}else if(hours==12){
+				mcr.setTimeSlot("12:00-13:00");
+			}else if(hours==13){
+				mcr.setTimeSlot("13:00-14:00");
+			}else if(hours==14){
+				mcr.setTimeSlot("14:00-15:00");
+			}else if(hours==15){
+				mcr.setTimeSlot("15:00-16:00");
+			}else if(hours==16){
+				mcr.setTimeSlot("16:00-17:00");
+			}else if(hours==17){
+				mcr.setTimeSlot("17:00-18:00");
+			}else if(hours==18){
+				mcr.setTimeSlot("18:00-19:00");
+			}else if(hours==19){
+				mcr.setTimeSlot("19:00-20:00");
+			}else if(hours==20){
+				mcr.setTimeSlot("20:00-21:00");
+			}else if(hours==21){
+				mcr.setTimeSlot("21:00-22:00");
+			}else if(hours==22){
+				mcr.setTimeSlot("22:00-23:00");
+			}else if(hours==23){
+				mcr.setTimeSlot("23:00-00:00");
+			}
+			MouldCycleRuntimeExample mcrExp = new MouldCycleRuntimeExample();
+			mcrExp.createCriteria().andDateStrEqualTo(mcr.getDateStr()).andEquipmentNoEqualTo(item.getEquipmentNo()).andTimeSlotEqualTo(mcr.getTimeSlot());
+			List<MouldCycleRuntime> mList = mouldCycleRuntimeMapper.selectByExample(mcrExp);
+			if(mList.size()>0){
+				mcr.setId(mList.get(0).getId());
+				mouldCycleRuntimeMapper.updateByPrimaryKeySelective(mcr);
+			}else{
+				mouldCycleRuntimeMapper.insertSelective(mcr);
+			}
+		}
+	}
 }

cloud-socket/src/com/js/kbt/mapper/TbMouldEquipmentMapper.java

@@ -9,68 +9,68 @@ public interface TbMouldEquipmentMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	long countByExample(TbMouldEquipmentExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	int deleteByExample(TbMouldEquipmentExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	int insert(TbMouldEquipment record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	int insertSelective(TbMouldEquipment record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	List<TbMouldEquipment> selectByExample(TbMouldEquipmentExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	TbMouldEquipment selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	int updateByExampleSelective(@Param("record") TbMouldEquipment record,
 			@Param("example") TbMouldEquipmentExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	int updateByExample(@Param("record") TbMouldEquipment record, @Param("example") TbMouldEquipmentExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	int updateByPrimaryKeySelective(TbMouldEquipment record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	int updateByPrimaryKey(TbMouldEquipment record);
 }

cloud-socket/src/com/js/kbt/mapper/TbMouldEquipmentMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="equipment_name" jdbcType="VARCHAR" property="equipmentName" />
@@ -22,12 +22,14 @@
     <result column="agent" jdbcType="VARCHAR" property="agent" />
     <result column="stage" jdbcType="INTEGER" property="stage" />
     <result column="sim" jdbcType="VARCHAR" property="sim" />
+    <result column="curhill_number" jdbcType="VARCHAR" property="curhillNumber" />
+    <result column="curtemperature" jdbcType="INTEGER" property="curtemperature" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -61,7 +63,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -95,16 +97,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, 
-    is_use, hill_number, lng, lat, temperature, agent, stage, sim
+    is_use, hill_number, lng, lat, temperature, agent, stage, sim, curhill_number, curtemperature
   </sql>
   <select id="selectByExample" parameterType="com.js.kbt.model.TbMouldEquipmentExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     select
     <if test="distinct">
@@ -123,7 +125,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -134,7 +136,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     delete from tb_mould_equipment
     where id = #{id,jdbcType=INTEGER}
@@ -143,7 +145,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     delete from tb_mould_equipment
     <if test="_parameter != null">
@@ -154,7 +156,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
@@ -163,18 +165,20 @@
       use_life, belong_company_id, equipment_no, 
       is_use, hill_number, lng, 
       lat, temperature, agent, 
-      stage, sim)
+      stage, sim, curhill_number, 
+      curtemperature)
     values (#{equipmentName,jdbcType=VARCHAR}, #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, 
       #{useLife,jdbcType=INTEGER}, #{belongCompanyId,jdbcType=INTEGER}, #{equipmentNo,jdbcType=VARCHAR}, 
       #{isUse,jdbcType=INTEGER}, #{hillNumber,jdbcType=VARCHAR}, #{lng,jdbcType=DOUBLE}, 
       #{lat,jdbcType=DOUBLE}, #{temperature,jdbcType=INTEGER}, #{agent,jdbcType=VARCHAR}, 
-      #{stage,jdbcType=INTEGER}, #{sim,jdbcType=VARCHAR})
+      #{stage,jdbcType=INTEGER}, #{sim,jdbcType=VARCHAR}, #{curhillNumber,jdbcType=VARCHAR}, 
+      #{curtemperature,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.js.kbt.model.TbMouldEquipment">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
@@ -223,6 +227,12 @@
       <if test="sim != null">
         sim,
       </if>
+      <if test="curhillNumber != null">
+        curhill_number,
+      </if>
+      <if test="curtemperature != null">
+        curtemperature,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="equipmentName != null">
@@ -267,13 +277,19 @@
       <if test="sim != null">
         #{sim,jdbcType=VARCHAR},
       </if>
+      <if test="curhillNumber != null">
+        #{curhillNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="curtemperature != null">
+        #{curtemperature,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.js.kbt.model.TbMouldEquipmentExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     select count(*) from tb_mould_equipment
     <if test="_parameter != null">
@@ -284,7 +300,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     update tb_mould_equipment
     <set>
@@ -333,6 +349,12 @@
       <if test="record.sim != null">
         sim = #{record.sim,jdbcType=VARCHAR},
       </if>
+      <if test="record.curhillNumber != null">
+        curhill_number = #{record.curhillNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.curtemperature != null">
+        curtemperature = #{record.curtemperature,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -342,7 +364,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     update tb_mould_equipment
     set id = #{record.id,jdbcType=INTEGER},
@@ -359,7 +381,9 @@
       temperature = #{record.temperature,jdbcType=INTEGER},
       agent = #{record.agent,jdbcType=VARCHAR},
       stage = #{record.stage,jdbcType=INTEGER},
-      sim = #{record.sim,jdbcType=VARCHAR}
+      sim = #{record.sim,jdbcType=VARCHAR},
+      curhill_number = #{record.curhillNumber,jdbcType=VARCHAR},
+      curtemperature = #{record.curtemperature,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -368,7 +392,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     update tb_mould_equipment
     <set>
@@ -414,6 +438,12 @@
       <if test="sim != null">
         sim = #{sim,jdbcType=VARCHAR},
       </if>
+      <if test="curhillNumber != null">
+        curhill_number = #{curhillNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="curtemperature != null">
+        curtemperature = #{curtemperature,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -421,7 +451,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     update tb_mould_equipment
     set equipment_name = #{equipmentName,jdbcType=VARCHAR},
@@ -437,7 +467,9 @@
       temperature = #{temperature,jdbcType=INTEGER},
       agent = #{agent,jdbcType=VARCHAR},
       stage = #{stage,jdbcType=INTEGER},
-      sim = #{sim,jdbcType=VARCHAR}
+      sim = #{sim,jdbcType=VARCHAR},
+      curhill_number = #{curhillNumber,jdbcType=VARCHAR},
+      curtemperature = #{curtemperature,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

cloud-socket/src/com/js/kbt/model/TbMouldEquipment.java

@@ -6,84 +6,94 @@ public class TbMouldEquipment {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.id
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.equipment_name
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private String equipmentName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.start_time
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private Date startTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.end_time
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private Date endTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.use_life
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private Integer useLife;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.belong_company_id
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private Integer belongCompanyId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.equipment_no
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private String equipmentNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.is_use
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private Integer isUse;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.hill_number
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private String hillNumber;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.lng
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private Double lng;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.lat
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private Double lat;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.temperature
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private Integer temperature;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.agent
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private String agent;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.stage
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private Integer stage;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.sim
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private String sim;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.curhill_number
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
+	 */
+	private String curhillNumber;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.curtemperature
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
+	 */
+	private Integer curtemperature;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.id
 	 * @return  the value of tb_mould_equipment.id
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -92,7 +102,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.id
 	 * @param id  the value for tb_mould_equipment.id
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -101,7 +111,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.equipment_name
 	 * @return  the value of tb_mould_equipment.equipment_name
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public String getEquipmentName() {
 		return equipmentName;
@@ -110,7 +120,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.equipment_name
 	 * @param equipmentName  the value for tb_mould_equipment.equipment_name
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setEquipmentName(String equipmentName) {
 		this.equipmentName = equipmentName;
@@ -119,7 +129,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.start_time
 	 * @return  the value of tb_mould_equipment.start_time
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Date getStartTime() {
 		return startTime;
@@ -128,7 +138,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.start_time
 	 * @param startTime  the value for tb_mould_equipment.start_time
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
@@ -137,7 +147,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.end_time
 	 * @return  the value of tb_mould_equipment.end_time
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Date getEndTime() {
 		return endTime;
@@ -146,7 +156,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.end_time
 	 * @param endTime  the value for tb_mould_equipment.end_time
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setEndTime(Date endTime) {
 		this.endTime = endTime;
@@ -155,7 +165,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.use_life
 	 * @return  the value of tb_mould_equipment.use_life
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Integer getUseLife() {
 		return useLife;
@@ -164,7 +174,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.use_life
 	 * @param useLife  the value for tb_mould_equipment.use_life
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setUseLife(Integer useLife) {
 		this.useLife = useLife;
@@ -173,7 +183,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.belong_company_id
 	 * @return  the value of tb_mould_equipment.belong_company_id
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Integer getBelongCompanyId() {
 		return belongCompanyId;
@@ -182,7 +192,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.belong_company_id
 	 * @param belongCompanyId  the value for tb_mould_equipment.belong_company_id
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setBelongCompanyId(Integer belongCompanyId) {
 		this.belongCompanyId = belongCompanyId;
@@ -191,7 +201,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.equipment_no
 	 * @return  the value of tb_mould_equipment.equipment_no
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public String getEquipmentNo() {
 		return equipmentNo;
@@ -200,7 +210,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.equipment_no
 	 * @param equipmentNo  the value for tb_mould_equipment.equipment_no
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setEquipmentNo(String equipmentNo) {
 		this.equipmentNo = equipmentNo;
@@ -209,7 +219,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.is_use
 	 * @return  the value of tb_mould_equipment.is_use
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Integer getIsUse() {
 		return isUse;
@@ -218,7 +228,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.is_use
 	 * @param isUse  the value for tb_mould_equipment.is_use
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setIsUse(Integer isUse) {
 		this.isUse = isUse;
@@ -227,7 +237,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.hill_number
 	 * @return  the value of tb_mould_equipment.hill_number
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public String getHillNumber() {
 		return hillNumber;
@@ -236,7 +246,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.hill_number
 	 * @param hillNumber  the value for tb_mould_equipment.hill_number
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setHillNumber(String hillNumber) {
 		this.hillNumber = hillNumber;
@@ -245,7 +255,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.lng
 	 * @return  the value of tb_mould_equipment.lng
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Double getLng() {
 		return lng;
@@ -254,7 +264,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.lng
 	 * @param lng  the value for tb_mould_equipment.lng
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setLng(Double lng) {
 		this.lng = lng;
@@ -263,7 +273,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.lat
 	 * @return  the value of tb_mould_equipment.lat
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Double getLat() {
 		return lat;
@@ -272,7 +282,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.lat
 	 * @param lat  the value for tb_mould_equipment.lat
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setLat(Double lat) {
 		this.lat = lat;
@@ -281,7 +291,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.temperature
 	 * @return  the value of tb_mould_equipment.temperature
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Integer getTemperature() {
 		return temperature;
@@ -290,7 +300,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.temperature
 	 * @param temperature  the value for tb_mould_equipment.temperature
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setTemperature(Integer temperature) {
 		this.temperature = temperature;
@@ -299,7 +309,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.agent
 	 * @return  the value of tb_mould_equipment.agent
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public String getAgent() {
 		return agent;
@@ -308,7 +318,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.agent
 	 * @param agent  the value for tb_mould_equipment.agent
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setAgent(String agent) {
 		this.agent = agent;
@@ -317,7 +327,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.stage
 	 * @return  the value of tb_mould_equipment.stage
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Integer getStage() {
 		return stage;
@@ -326,7 +336,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.stage
 	 * @param stage  the value for tb_mould_equipment.stage
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setStage(Integer stage) {
 		this.stage = stage;
@@ -335,7 +345,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.sim
 	 * @return  the value of tb_mould_equipment.sim
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public String getSim() {
 		return sim;
@@ -344,9 +354,45 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.sim
 	 * @param sim  the value for tb_mould_equipment.sim
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setSim(String sim) {
 		this.sim = sim;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.curhill_number
+	 * @return  the value of tb_mould_equipment.curhill_number
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
+	 */
+	public String getCurhillNumber() {
+		return curhillNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.curhill_number
+	 * @param curhillNumber  the value for tb_mould_equipment.curhill_number
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
+	 */
+	public void setCurhillNumber(String curhillNumber) {
+		this.curhillNumber = curhillNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.curtemperature
+	 * @return  the value of tb_mould_equipment.curtemperature
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
+	 */
+	public Integer getCurtemperature() {
+		return curtemperature;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.curtemperature
+	 * @param curtemperature  the value for tb_mould_equipment.curtemperature
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
+	 */
+	public void setCurtemperature(Integer curtemperature) {
+		this.curtemperature = curtemperature;
+	}
 }

cloud-socket/src/com/js/kbt/model/TbMouldEquipmentExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class TbMouldEquipmentExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public TbMouldEquipmentExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1112,11 +1112,141 @@ public class TbMouldEquipmentExample {
 			addCriterion("sim not between", value1, value2, "sim");
 			return (Criteria) this;
 		}
+
+		public Criteria andCurhillNumberIsNull() {
+			addCriterion("curhill_number is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberIsNotNull() {
+			addCriterion("curhill_number is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberEqualTo(String value) {
+			addCriterion("curhill_number =", value, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberNotEqualTo(String value) {
+			addCriterion("curhill_number <>", value, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberGreaterThan(String value) {
+			addCriterion("curhill_number >", value, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberGreaterThanOrEqualTo(String value) {
+			addCriterion("curhill_number >=", value, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberLessThan(String value) {
+			addCriterion("curhill_number <", value, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberLessThanOrEqualTo(String value) {
+			addCriterion("curhill_number <=", value, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberLike(String value) {
+			addCriterion("curhill_number like", value, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberNotLike(String value) {
+			addCriterion("curhill_number not like", value, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberIn(List<String> values) {
+			addCriterion("curhill_number in", values, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberNotIn(List<String> values) {
+			addCriterion("curhill_number not in", values, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberBetween(String value1, String value2) {
+			addCriterion("curhill_number between", value1, value2, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberNotBetween(String value1, String value2) {
+			addCriterion("curhill_number not between", value1, value2, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureIsNull() {
+			addCriterion("curtemperature is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureIsNotNull() {
+			addCriterion("curtemperature is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureEqualTo(Integer value) {
+			addCriterion("curtemperature =", value, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureNotEqualTo(Integer value) {
+			addCriterion("curtemperature <>", value, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureGreaterThan(Integer value) {
+			addCriterion("curtemperature >", value, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureGreaterThanOrEqualTo(Integer value) {
+			addCriterion("curtemperature >=", value, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureLessThan(Integer value) {
+			addCriterion("curtemperature <", value, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureLessThanOrEqualTo(Integer value) {
+			addCriterion("curtemperature <=", value, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureIn(List<Integer> values) {
+			addCriterion("curtemperature in", values, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureNotIn(List<Integer> values) {
+			addCriterion("curtemperature not in", values, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureBetween(Integer value1, Integer value2) {
+			addCriterion("curtemperature between", value1, value2, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureNotBetween(Integer value1, Integer value2) {
+			addCriterion("curtemperature not between", value1, value2, "curtemperature");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

cloud-socket/src/com/js/kbt/socket/UserHandler.java

@@ -299,13 +299,13 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 		meqExp.createCriteria().andEquipmentNoEqualTo(item.getEquipmentNo());
 		if (tbMouldEquipmentMapper.countByExample(meqExp) > 0) {
 			TbMouldEquipment me = tbMouldEquipmentMapper.selectByExample(meqExp).get(0);
-			me.setHillNumber(item.getBattery() + "");
+			me.setCurhillNumber(item.getBattery() + "");
 			if (item.getLng() != null) {
 				logger.info("更新经纬度:");
 				me.setLng(Double.parseDouble(item.getLng()));
 				me.setLat(Double.parseDouble(item.getLat()));
 			}
-			me.setTemperature(item.getTemperature());
+			me.setCurtemperature(item.getTemperature());
 			if (item.getAlarm() == 8) {
 				me.setStage(3);// 安装被拆
 			} else if (item.getAlarm() == 1) {
@@ -321,7 +321,6 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 				 * 无报警 0； 低电量报警 1； 温度过热 2； 安装被拆 8。
 				 */
 				logger.info("设备报警啦:" + item.getAlarm());
-
 			}
 			tbMouldEquipmentMapper.updateByPrimaryKeySelective(me);
 			logger.info("更新完了tbMouldEquipment的状态和温度以及经纬度");

cloud-socket/src/jdbc.properties

@@ -1,7 +1,7 @@
 classPath=D:/model/cloud-socket/WebContent/WEB-INF/lib/mysql-connector-java-5.1.31-bin.jar
 #classPath=D:/workspace/yunsu/cloud-socket/WebContent/WEB-INF/lib/mysql-connector-java-5.1.31-bin.jar
 driver=com.mysql.jdbc.Driver
-url=jdbc:mysql://118.190.47.230:3306/new_cloud_model?autoReconnect=true&rewriteBatchedStatements=TRUE&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
+url=jdbc:mysql://118.190.47.230:3306/cloud_model_test?autoReconnect=true&rewriteBatchedStatements=TRUE&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
 username=root
 password=p011430seya1026
 maxActive=255