|
@@ -68,7 +68,7 @@ public class MySqlUtil {
|
|
* @param ruleDetail104
|
|
* @param ruleDetail104
|
|
*/
|
|
*/
|
|
public static void dealMessage(MessageDetail ruleDetail104) {
|
|
public static void dealMessage(MessageDetail ruleDetail104) {
|
|
- log.info("处理数据中……………………" );
|
|
|
|
|
|
+ log.info("处理数据中……………………");
|
|
LocalDateTime time = LocalDateTime.now();
|
|
LocalDateTime time = LocalDateTime.now();
|
|
int year = time.getYear();
|
|
int year = time.getYear();
|
|
int month = time.getMonthValue();
|
|
int month = time.getMonthValue();
|
|
@@ -84,19 +84,19 @@ public class MySqlUtil {
|
|
addMessage.add(messageInfo);
|
|
addMessage.add(messageInfo);
|
|
} else if (messageInfo.getMessageAddress() >= remote_config_measure_min && messageInfo.getMessageAddress() <= remote_config_measure_max) {
|
|
} else if (messageInfo.getMessageAddress() >= remote_config_measure_min && messageInfo.getMessageAddress() <= remote_config_measure_max) {
|
|
updateMessage.add(messageInfo);
|
|
updateMessage.add(messageInfo);
|
|
- } else{
|
|
|
|
|
|
+ } else {
|
|
log.info("数据点位不在采集范围内,不处理" + messageInfo.getMessageAddress());
|
|
log.info("数据点位不在采集范围内,不处理" + messageInfo.getMessageAddress());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// 新增电度数据
|
|
// 新增电度数据
|
|
if (!CollectionUtils.isEmpty(addMessage)) {
|
|
if (!CollectionUtils.isEmpty(addMessage)) {
|
|
- log.info("新增电度数量:" + addMessage.size() );
|
|
|
|
|
|
+ log.info("新增电度数量:" + addMessage.size());
|
|
addBatch(addMessage, time, year, month, day, hour, minute);
|
|
addBatch(addMessage, time, year, month, day, hour, minute);
|
|
}
|
|
}
|
|
// 更新遥测数据
|
|
// 更新遥测数据
|
|
if (!CollectionUtils.isEmpty(updateMessage)) {
|
|
if (!CollectionUtils.isEmpty(updateMessage)) {
|
|
- log.info("更新遥测数量:" + updateMessage.size() );
|
|
|
|
- updateBatch(updateMessage,time);
|
|
|
|
|
|
+ log.info("更新遥测数量:" + updateMessage.size());
|
|
|
|
+ updateBatch(updateMessage, time);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -123,8 +123,8 @@ public class MySqlUtil {
|
|
if (num.length == 0) {
|
|
if (num.length == 0) {
|
|
throw new BusinessException("批量更新t_remote_measure失败");
|
|
throw new BusinessException("批量更新t_remote_measure失败");
|
|
// 找不到定位数据,属于新增,则对应新增进入库,但是没有系数也不好处理
|
|
// 找不到定位数据,属于新增,则对应新增进入库,但是没有系数也不好处理
|
|
- }else{
|
|
|
|
- log.info("已更新:" + num.length );
|
|
|
|
|
|
+ } else {
|
|
|
|
+ log.info("已更新:" + num.length);
|
|
}
|
|
}
|
|
stmt.clearBatch();
|
|
stmt.clearBatch();
|
|
stmt.close();
|
|
stmt.close();
|
|
@@ -178,7 +178,13 @@ public class MySqlUtil {
|
|
ps.setObject(11, "1");
|
|
ps.setObject(11, "1");
|
|
ps.addBatch();
|
|
ps.addBatch();
|
|
}
|
|
}
|
|
- ps.executeBatch();
|
|
|
|
|
|
+ int[] num = ps.executeBatch();
|
|
|
|
+ if (num.length == 0) {
|
|
|
|
+ throw new BusinessException("批量新增t_remote_degree_log失败");
|
|
|
|
+ // 找不到定位数据,属于新增,则对应新增进入库,但是没有系数也不好处理
|
|
|
|
+ } else {
|
|
|
|
+ log.info("已新增:" + num.length);
|
|
|
|
+ }
|
|
ps.clearBatch();
|
|
ps.clearBatch();
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|