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/cloud_model_test?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/new_cloud_model?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

@@ -127,7 +127,7 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 		item.setWifiBbsid(input.substring(52 * 2, 58 * 2));
 		String temp = "0x" + input.substring(58 * 2, 59 * 2);
 		System.out.println(temp);
-		int i = Integer.decode(temp)-40;
+		int i = Integer.decode(temp) - 40;
 		System.out.println(i);
 		logger.info("温度-----------》: " + i);
 		item.setTemperature(i);
@@ -152,7 +152,7 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 		}
 		String crcStr = input.substring(input.length() - 4);
 		item.setCrcCode("" + reverseParseHex(crcStr));
-		//找寻上一条最新记录
+		// 找寻上一条最新记录
 		MouldHistoryExample mExp = new MouldHistoryExample();
 		mExp.setOrderByClause("order by id desc limit 1");
 		mExp.createCriteria().andEquipmentNoEqualTo(item.getEquipmentNo());
@@ -193,29 +193,33 @@ 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<MouldHistoryTime> list =
+		// mouldHistoryTimeMapper.selectByEquipmentNoAndThanZero(item.getEquipmentNo());
 		List<MouldHistory> list = mouldHistoryMapper.selectByExample(exp);
-		int avgTime = 0;
-		int totalTime = 0;
-		if(list.size()==1){
-			//证明盒子动了，找寻上一条记录
-			if(newList.size()>0){
-				newList.get(0).getIndate().getTime();
+		Long avgTime = 0L;
+		Long totalTime = 0L;
+		if (list.size() == 1) {
+			// 证明盒子动了，找寻上一条记录
+			if (newList.size() > 0) {
+				avgTime =  ((list.get(0).getIndate().getTime()) - (newList.get(0).getIndate().getTime()));
 			}
-		}
-		for (MouldHistory t : list) {
-				//删选掉负值的数据
-//			logger.info("第i条数据开合模周期耗时-------------》》"+t.getTimeCost());
-				totalTime += t.getTimeCost();
-		}
-//		logger.info("开合模周期总耗时次数==》"+totalTime);
-		if (list.size() == 0) {
-			avgTime = 0;
 		} else {
-				avgTime = totalTime / list.size();
-			
+			if (list.size() > 1) {
+				for (int j = 0; j < list.size()-1; j++) {
+					// 删选掉负值的数据
+					// logger.info("第i条数据开合模周期耗时-------------》》"+t.getTimeCost());
+					totalTime = (list.get(j+1).getIndate().getTime() - list.get(j).getIndate().getTime());
+				}
+				avgTime = totalTime/(list.size()-1);
+			}
 		}
-//		logger.info("开合模平均周期耗时次数==》"+avgTime);
+//		// logger.info("开合模周期总耗时次数==》"+totalTime);
+//		if (list.size() == 0) {
+//			avgTime = 0L;
+//		} else {
+//			avgTime = totalTime / list.size();
+//		}
+		// logger.info("开合模平均周期耗时次数==》"+avgTime);
 		handleModLogic(item, avgTime);
 		// 判断预留字节的
 		if ("02".equals(mobilePart)) {
@@ -265,7 +269,7 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 		}
 	}
 
-	private void handleModLogic(MouldHistory item, int avgTime) {
+	private void handleModLogic(MouldHistory item, Long avgTime) {
 		TbMouldEquipmentExample meqExp = new TbMouldEquipmentExample();
 		meqExp.createCriteria().andEquipmentNoEqualTo(item.getEquipmentNo());
 		if (tbMouldEquipmentMapper.countByExample(meqExp) > 0) {
@@ -278,12 +282,12 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 
 			me.setTemperature(item.getTemperature());
 			if (item.getAlarm() == 8) {
-				me.setStage(3);//安装被拆
-			}else if(item.getAlarm() == 1){
+				me.setStage(3);// 安装被拆
+			} else if (item.getAlarm() == 1) {
 				me.setStage(2);// 低电量
-			}else if(item.getAlarm() == 2){
-				me.setStage(1);//高温
-			}else{
+			} else if (item.getAlarm() == 2) {
+				me.setStage(1);// 高温
+			} else {
 				me.setStage(item.getAlarm());
 			}
 			// 处理报警

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/cloud_model_test?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/new_cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=p011430seya1026
 #spring.datasource.druid.test-on-borrow=true

target/classes/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" />