Browse Source

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

develop
lau572 3 weeks ago
parent
commit
fe1acb7844
  1. 4
      zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java

4
zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java

@ -198,14 +198,14 @@ public class WeatherForecastController extends BaseController {
&& Objects.equals(ite.getWarningType(), UniversalEnum.TWO.getValue())).collect(Collectors.toList()); && Objects.equals(ite.getWarningType(), UniversalEnum.TWO.getValue())).collect(Collectors.toList());
if (collect.size() == UniversalEnum.ZERO.getNumber()) { if (collect.size() == UniversalEnum.ZERO.getNumber()) {
String content= WeatherTrafficProposeUtil.content(Integer.parseInt(warningLevel), earlyWarningType); String content= WeatherTrafficProposeUtil.content(Integer.parseInt(warningLevel), earlyWarningType);
jsonObject.put("earlyWorningContent", jsonObject.getString("earlyWorningContent")+content);
WebSocketService.broadcast(UniversalEnum.THREE.getValue(), jsonObject); //推送事件消息 不是感知事件
DcNoStakeWarningTable dcNoStakeWarningTable = new DcNoStakeWarningTable(); DcNoStakeWarningTable dcNoStakeWarningTable = new DcNoStakeWarningTable();
dcNoStakeWarningTable.setWarningDescription(jsonObject.getString("earlyWorningContent")); dcNoStakeWarningTable.setWarningDescription(jsonObject.getString("earlyWorningContent"));
dcNoStakeWarningTable.setWarningType(UniversalEnum.TWO.getValue()); dcNoStakeWarningTable.setWarningType(UniversalEnum.TWO.getValue());
dcNoStakeWarningTable.setWarningTime(jsonObject.getDate("earlyWorningIssueDate")); dcNoStakeWarningTable.setWarningTime(jsonObject.getDate("earlyWorningIssueDate"));
dcNoStakeWarningTable.setOtherConfig(String.valueOf(jsonObject)); dcNoStakeWarningTable.setOtherConfig(String.valueOf(jsonObject));
noStakeWarningTableService.addDcNoStakeWarningTable(dcNoStakeWarningTable); noStakeWarningTableService.addDcNoStakeWarningTable(dcNoStakeWarningTable);
jsonObject.put("earlyWorningContent", jsonObject.getString("earlyWorningContent")+content);
WebSocketService.broadcast(UniversalEnum.THREE.getValue(), jsonObject); //推送事件消息 不是感知事件
} }
}); });

Loading…
Cancel
Save