mengff
/
jihe-dc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/develop' into develop

develop
zhaoxianglong 9 months ago
parent
0872cab14b 512b4c1e28
commit
c794f2772d
1 changed files with 9 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java

12
zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java
View File

@ -320,7 +320,9 @@ public class DeviceMessageHandler {
String title = direction + WarningSubclassEnum.getDecorateInfo(warningSubclass); String title = direction + WarningSubclassEnum.getDecorateInfo(warningSubclass);
// 标题 // 标题
dcWarning.setWarningTitle(title); dcWarning.setWarningTitle(title);
dcWarning.setRemark(DateUtil.formatDateTime(DateUtil.date(captureTime)) + UniversalEnum.BLANK_SPACE.getValue() + title); SimpleDateFormat sdf = new SimpleDateFormat(UniversalEnum.CHINESE_CHARACTER_TIME_FORMAT.getValue());
String formattedDate = sdf.format(new Date());
dcWarning.setRemark(formattedDate + UniversalEnum.BLANK_SPACE.getValue() + title);
// 影响车道 // 影响车道
// 物联设备id // 物联设备id
@ -622,7 +624,9 @@ public class DeviceMessageHandler {
DcWarning dcWarning = new DcWarning(); DcWarning dcWarning = new DcWarning();
dcWarning.setWarningState(UniversalEnum.ONE.getNumber()); dcWarning.setWarningState(UniversalEnum.ONE.getNumber());
dcWarning.setRemark(new Date() + UniversalEnum.BLANK_SPACE.getValue() + content); SimpleDateFormat sdf = new SimpleDateFormat(UniversalEnum.CHINESE_CHARACTER_TIME_FORMAT.getValue());
String formattedDate = sdf.format(new Date());
dcWarning.setRemark(formattedDate + UniversalEnum.BLANK_SPACE.getValue() + content);
dcWarning.setWarningTime(new Date()); dcWarning.setWarningTime(new Date());
dcWarning.setWarningType(UniversalEnum.EIGHT_ONE.getNumber()); dcWarning.setWarningType(UniversalEnum.EIGHT_ONE.getNumber());
dcWarning.setWarningSubclass(UniversalEnum.EIGHT_ONE.getValue()); dcWarning.setWarningSubclass(UniversalEnum.EIGHT_ONE.getValue());
@ -669,7 +673,9 @@ public class DeviceMessageHandler {
String string = object.toString(); String string = object.toString();
DcWarning dcWarning = new DcWarning(); DcWarning dcWarning = new DcWarning();
dcWarning.setWarningState(UniversalEnum.ONE.getNumber()); dcWarning.setWarningState(UniversalEnum.ONE.getNumber());
dcWarning.setRemark(new Date() + UniversalEnum.BLANK_SPACE.getValue() + content); SimpleDateFormat sdf = new SimpleDateFormat(UniversalEnum.CHINESE_CHARACTER_TIME_FORMAT.getValue());
String formattedDate = sdf.format(new Date());
dcWarning.setRemark(formattedDate + UniversalEnum.BLANK_SPACE.getValue() + content);
dcWarning.setWarningTime(new Date()); dcWarning.setWarningTime(new Date());
dcWarning.setWarningType(UniversalEnum.EIGHT_FOUR.getNumber()); dcWarning.setWarningType(UniversalEnum.EIGHT_FOUR.getNumber());
dcWarning.setWarningSubclass(UniversalEnum.EIGHT_FOUR.getValue()); dcWarning.setWarningSubclass(UniversalEnum.EIGHT_FOUR.getValue());

Write Preview
Loading…
Cancel
Save