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-socket/src/com/js/kbt/controller/WeiXinUserInfoController.java

@@ -275,13 +275,14 @@ public class WeiXinUserInfoController {
 		TbMouldEquipmentExample tExp = new TbMouldEquipmentExample();
 		String[] split = equipmentNo.split(",");
 		for (String string : split) {
+			System.out.println("进来了"+string);
 			exp.createCriteria().andEquipmentNoEqualTo(string);
 			tExp.createCriteria().andEquipmentNoEqualTo(string);
-			TbMouldEquipment equipment = new TbMouldEquipment();
+			TbMouldEquipment equipment = tbMouldEquipmentMapper.selectByExample(tExp).get(0);
 			equipment.setHillNumber(lowPowerLimit+"%");
 			equipment.setTemperature(hotAlarmLimit);
 			//更新云模盒的报警温度和电量
-			tbMouldEquipmentMapper.updateByExampleSelective(equipment, tExp);
+			tbMouldEquipmentMapper.updateByPrimaryKey(equipment);
 			List<MouldDownPacket> list = mouldDownPacketMapper.selectByExample(exp);
 			if(list.size()>0){
 				mouldDownPacket = list.get(0);
@@ -296,6 +297,7 @@ public class WeiXinUserInfoController {
 				mouldDownPacketMapper.insertSelective(mouldDownPacket);
 			}
 			exp.clear();
+			tExp.clear();
 		}
 		msg.data = setPacketMessage;
 		response.setContentType("application/json");

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/cloud_model?autoReconnect=true&rewriteBatchedStatements=TRUE&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
+url=jdbc:mysql://118.190.47.230:3306/new_cloud_model?autoReconnect=true&rewriteBatchedStatements=TRUE&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
 username=root
 password=p011430seya1026
 maxActive=255