Skip to content

Z
zhmes-agecal
Commit 509ce144 authored by wanghao's avatar wanghao
Browse files
Options

1 时间运行状态正常的话为空问题处理 

2 记录 标定历史数据调整。
parent 01101760
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 58 deletions
zhmes-agecal-system/src/main/java/com/zehong/system/task/PrepareFinalExecutionJob.java
View file @ 509ce144
...@@ -391,7 +391,7 @@ public class PrepareFinalExecutionJob implements Job { ...@@ -391,7 +391,7 @@ public class PrepareFinalExecutionJob implements Job {
*/ */
private void handleTimeConsistent(int deviceId, PalletDeviceBinding binding) { private void handleTimeConsistent(int deviceId, PalletDeviceBinding binding) {
log.info("设备{}时间与系统时间一致，无需更新", deviceId); log.info("设备{}时间与系统时间一致，无需更新", deviceId);
binding.setWriteTimeStatus("1"); // 时间状态正常 binding.setRunTimeStatus("1"); // 时间状态正常
log.info("设备{}时间检查完成：时间一致", deviceId); log.info("设备{}时间检查完成：时间一致", deviceId);
} }
/** /**
...@@ -424,11 +424,11 @@ public class PrepareFinalExecutionJob implements Job { ...@@ -424,11 +424,11 @@ public class PrepareFinalExecutionJob implements Job {
binding.setRecordDate(String.valueOf(day)); binding.setRecordDate(String.valueOf(day));
binding.setRecordHour(String.valueOf(hour)); binding.setRecordHour(String.valueOf(hour));
binding.setRecordMinute(String.valueOf(minute)); binding.setRecordMinute(String.valueOf(minute));
binding.setWriteTimeStatus("1"); binding.setRunTimeStatus("1");
log.info("设备{}时间更新成功: {}-{}-{} {}:{}", log.info("设备{}时间更新成功: {}-{}-{} {}:{}",
deviceId, year, month, day, hour, minute); deviceId, year, month, day, hour, minute);
} else { } else {
binding.setWriteTimeStatus("0"); binding.setRunTimeStatus("0");
log.error("设备{}时间更新失败", deviceId); log.error("设备{}时间更新失败", deviceId);
recordAlarmByBinding(binding, "设备时间更新失败"); recordAlarmByBinding(binding, "设备时间更新失败");
} }
...@@ -438,7 +438,7 @@ public class PrepareFinalExecutionJob implements Job { ...@@ -438,7 +438,7 @@ public class PrepareFinalExecutionJob implements Job {
binding.setRunTimeStatus("0"); binding.setRunTimeStatus("0");
} // 3. 写时间状态 异常状态；不管 } // 3. 写时间状态 异常状态；不管
} catch (Exception e) { } catch (Exception e) {
binding.setWriteTimeStatus("0"); binding.setRunTimeStatus("0");
log.error("设备{}时间更新异常", deviceId, e); log.error("设备{}时间更新异常", deviceId, e);
recordAlarmByBinding(binding, "设备时间更新异常: " + e.getMessage()); recordAlarmByBinding(binding, "设备时间更新异常: " + e.getMessage());
} }
......
zhmes-agecal-system/src/main/resources/mapper/system/PalletDeviceUploadHistoryMapper.xml
View file @ 509ce144
...@@ -83,64 +83,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -83,64 +83,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="batchInsert" parameterType="list"> <insert id="batchInsert" parameterType="list">
insert into t_pallet_device_upload_history insert into t_pallet_device_upload_history
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="list != null and list.size() > 0"> f_tray_id,
<if test="list[0].trayId != null">f_tray_id,</if> f_device_code,
<if test="list[0].deviceCode != null">f_device_code,</if> f_row,
<if test="list[0].row != null">f_row,</if> f_col,
<if test="list[0].col != null">f_col,</if> f_index,
<if test="list[0].index != null">f_index,</if> f_number,
<if test="list[0].number != null">f_number,</if> f_binding_time,
<if test="list[0].bindingTime != null">f_binding_time,</if> f_unbinding_time,
<if test="list[0].unbindingTime != null">f_unbinding_time,</if> f_create_time,
<if test="list[0].createTime != null">f_create_time,</if> f_status,
<if test="list[0].status != null">f_status,</if> f_record_year,
<if test="list[0].recordYear != null">f_record_year,</if> f_record_month,
<if test="list[0].recordMonth != null">f_record_month,</if> f_record_date,
<if test="list[0].recordDate != null">f_record_date,</if> f_record_hour,
<if test="list[0].recordHour != null">f_record_hour,</if> f_record_minute,
<if test="list[0].recordMinute != null">f_record_minute,</if> f_write_time_status,
<if test="list[0].writeTimeStatus != null">f_write_time_status,</if> f_adjustment_zero_ad,
<if test="list[0].adjustmentZeroAd != null">f_adjustment_zero_ad,</if> f_zero_status,
<if test="list[0].zeroStatus != null">f_zero_status,</if> f_calibration_ad,
<if test="list[0].calibrationAd != null">f_calibration_ad,</if> f_calibration_status,
<if test="list[0].calibrationStatus != null">f_calibration_status,</if> f_concentration,
<if test="list[0].concentration != null">f_concentration,</if> f_run_time_status,
<if test="list[0].runTimeStatus != null">f_run_time_status,</if> f_real_time_ad,
<if test="list[0].realTimeAd != null">f_real_time_ad,</if> f_real_time_ad_status,
<if test="list[0].realTimeAdStatus != null">f_real_time_ad_status,</if> f_calibration_concentration,
<if test="list[0].calibrationConcentration != null">f_calibration_concentration,</if> f_calibration_concentration_status
<if test="list[0].calibrationConcentrationStatus != null">f_calibration_concentration_status,</if>
</if>
</trim> </trim>
values values
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="item.trayId != null">#{item.trayId},</if> #{item.trayId},
<if test="item.deviceCode != null">#{item.deviceCode},</if> #{item.deviceCode},
<if test="item.row != null">#{item.row},</if> #{item.row},
<if test="item.col != null">#{item.col},</if> #{item.col},
<if test="item.index != null">#{item.index},</if> #{item.index},
<if test="item.number != null">#{item.number},</if> #{item.number},
<if test="item.bindingTime != null">#{item.bindingTime},</if> #{item.bindingTime},
<if test="item.unbindingTime != null">#{item.unbindingTime},</if> #{item.unbindingTime},
<if test="item.createTime != null">#{item.createTime},</if> #{item.createTime},
<if test="item.status != null">#{item.status},</if> #{item.status},
<if test="item.recordYear != null">#{item.recordYear},</if> #{item.recordYear},
<if test="item.recordMonth != null">#{item.recordMonth},</if> #{item.recordMonth},
<if test="item.recordDate != null">#{item.recordDate},</if> #{item.recordDate},
<if test="item.recordHour != null">#{item.recordHour},</if> #{item.recordHour},
<if test="item.recordMinute != null">#{item.recordMinute},</if> #{item.recordMinute},
<if test="item.writeTimeStatus != null">#{item.writeTimeStatus},</if> #{item.writeTimeStatus},
<if test="item.adjustmentZeroAd != null">#{item.adjustmentZeroAd},</if> #{item.adjustmentZeroAd},
<if test="item.zeroStatus != null">#{item.zeroStatus},</if> #{item.zeroStatus},
<if test="item.calibrationAd != null">#{item.calibrationAd},</if> #{item.calibrationAd},
<if test="item.calibrationStatus != null">#{item.calibrationStatus},</if> #{item.calibrationStatus},
<if test="item.concentration != null">#{item.concentration},</if> #{item.concentration},
<if test="item.runTimeStatus != null">#{item.runTimeStatus},</if> #{item.runTimeStatus},
<if test="item.realTimeAd != null">#{item.realTimeAd},</if> #{item.realTimeAd},
<if test="item.realTimeAdStatus != null">#{item.realTimeAdStatus},</if> #{item.realTimeAdStatus},
<if test="item.calibrationConcentration != null">#{item.calibrationConcentration},</if> #{item.calibrationConcentration},
<if test="item.calibrationConcentrationStatus != null">#{item.calibrationConcentrationStatus},</if> #{item.calibrationConcentrationStatus}
</trim> </trim>
</foreach> </foreach>
</insert> </insert>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment