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

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

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

@@ -33,5 +33,5 @@ public class MouldVO extends Mould {
     private Double lat;
     private Integer stage;
     private String equipmentName;
-    private Integer temperature ;
+    private Integer temperature;
 }

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

@@ -69,7 +69,7 @@
         <result column="endTime" property="endTime"/>
         <result column="lastopentime" property="lastOpenTime"/>
         <result column="hillNumber" property="hillNumber"/>
-        <result column="temperature " property="temperature"/>
+        <result column="temperature" property="temperature"/>
         <result column="ownerCompanyName" property="ownerCompanyName"/>
         <result column="companyName" property="companyName"/>
         <result column="is_maintain" property="isMaintain" />

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

@@ -154,10 +154,10 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 		item.setCrcCode("" + reverseParseHex(crcStr));
 		//找寻上一条最新记录
 		MouldHistoryExample mExp = new MouldHistoryExample();
-		mExp.setOrderByClause("id desc");;
+		mExp.setOrderByClause("order by id desc limit 1");
 		mExp.createCriteria().andEquipmentNoEqualTo(item.getEquipmentNo());
 		// 存入数据库
-		mouldHistoryMapper.selectByExample(example);
+		List<MouldHistory> newList = mouldHistoryMapper.selectByExample(mExp);
 		mouldHistoryMapper.insertSelective(item);
 		logger.info("添加数据完成了-----------》: " + item);
 		// 模具开合记录
@@ -191,6 +191,7 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 		}
 		// 统计该模盒的平均开合周期
 		MouldHistoryExample exp = new MouldHistoryExample();
+		exp.setOrderByClause("id");
 		exp.createCriteria().andEquipmentNoEqualTo(item.getEquipmentNo()).andRunCntEqualTo(item.getRunCnt());
 //		List<MouldHistoryTime> list = mouldHistoryTimeMapper.selectByEquipmentNoAndThanZero(item.getEquipmentNo());
 		List<MouldHistory> list = mouldHistoryMapper.selectByExample(exp);
@@ -198,7 +199,9 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 		int totalTime = 0;
 		if(list.size()==1){
 			//证明盒子动了，找寻上一条记录
-			
+			if(newList.size()>0){
+				newList.get(0).getIndate().getTime();
+			}
 		}
 		for (MouldHistory t : list) {
 				//删选掉负值的数据

target/classes/main/resources/application.properties

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