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/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

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

@@ -154,7 +154,8 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 		item.setCrcCode("" + reverseParseHex(crcStr));
 		//找寻上一条最新记录
 		MouldHistoryExample mExp = new MouldHistoryExample();
-		mExp.createCriteria().andEquipmentNoEqualTo(value)
+		mExp.setOrderByClause("id desc");;
+		mExp.createCriteria().andEquipmentNoEqualTo(item.getEquipmentNo());
 		// 存入数据库
 		mouldHistoryMapper.selectByExample(example);
 		mouldHistoryMapper.insertSelective(item);