|
@@ -7,6 +7,7 @@ import com.ozs.common.core.domain.Result;
|
|
|
import com.ozs.common.core.domain.entity.SysUser;
|
|
|
import com.ozs.common.utils.ApiTokenUtils;
|
|
|
import com.ozs.common.utils.AppTokenUtils;
|
|
|
+import com.ozs.common.utils.AppendUtils;
|
|
|
import com.ozs.common.utils.StringUtils;
|
|
|
import com.ozs.common.utils.stateSecrets.SM4Utils;
|
|
|
import com.ozs.service.entity.BaseCameraManagement;
|
|
@@ -14,13 +15,9 @@ import com.ozs.service.entity.BaseDeviceDynamicManagement;
|
|
|
import com.ozs.service.entity.MsgAlarm;
|
|
|
import com.ozs.service.entity.MsgAlarmFrequency;
|
|
|
import com.ozs.service.entity.SvcAddress;
|
|
|
+import com.ozs.service.entity.vo.MsgAlarmResp;
|
|
|
import com.ozs.service.mapper.BaseUserMapper;
|
|
|
-import com.ozs.service.service.BaseCameraManagementService;
|
|
|
-import com.ozs.service.service.BaseDeviceDynamicManagementService;
|
|
|
-import com.ozs.service.service.BaseUserService;
|
|
|
-import com.ozs.service.service.MsgAlarmFrequencyService;
|
|
|
-import com.ozs.service.service.MsgAlarmService;
|
|
|
-import com.ozs.service.service.SvcAddressService;
|
|
|
+import com.ozs.service.service.*;
|
|
|
import com.ozs.vo.ReqDeviceVo;
|
|
|
import com.ozs.vo.ReqMsgAlarmVo;
|
|
|
import com.ozs.vo.RespGeoHazardMonitorVo;
|
|
@@ -65,6 +62,8 @@ public class GeoHazardMonitorTokenController {
|
|
|
private WebSocketServer webSocketServer;
|
|
|
@Autowired
|
|
|
private BaseUserService baseUserService;
|
|
|
+ @Resource
|
|
|
+ private BaseRailwayManagementService baseRailwayManagementService;
|
|
|
|
|
|
|
|
|
* 获取web访问令牌
|
|
@@ -137,17 +136,27 @@ public class GeoHazardMonitorTokenController {
|
|
|
Set<String> set = baseUserService.getUserIdList(baseCameraManagement.getCreateBy(), baseCameraManagement.getDeptId());
|
|
|
|
|
|
String[] list = set.toArray(new String[set.size()]);
|
|
|
+ MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
|
|
|
+ String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
|
|
|
+ String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
|
|
|
+ String endMile = begin + "-" + end;
|
|
|
+ msgAlarmResp.setBeginMile(endMile);
|
|
|
+ String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
|
|
|
+ msgAlarmResp.setAlarmMile(mile);
|
|
|
+ String cameraCode = baseCameraManagement.getCameraCode();
|
|
|
+ String cameraName = baseRailwayManagementService.getCameraNameByCameraCode(cameraCode);
|
|
|
+ msgAlarmResp.setRailwayName(cameraName);
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
- webSocketServer.sendMoreMessage(list, objStr(baseCameraManagement, 1));
|
|
|
+ webSocketServer.sendMoreMessage(list, objStr(msgAlarmResp, 1));
|
|
|
Thread.sleep(3 * 1000);
|
|
|
|
|
|
- webSocketServer.sendMoreMessage(list, objStr(baseCameraManagement, 2));
|
|
|
+ webSocketServer.sendMoreMessage(list, objStr(msgAlarmResp, 2));
|
|
|
Thread.sleep(5 * 1000);
|
|
|
|
|
|
- webSocketServer.sendMoreMessage(list, Math.random() * 10 > 5 ? objStr(baseCameraManagement, 6) : objStr(baseCameraManagement, 7));
|
|
|
+ webSocketServer.sendMoreMessage(list, Math.random() * 10 > 5 ? objStr(msgAlarmResp, 6) : objStr(msgAlarmResp, 7));
|
|
|
} catch (InterruptedException e) {
|
|
|
e.printStackTrace();
|
|
|
throw new RuntimeException("构建失败");
|
|
@@ -215,9 +224,9 @@ public class GeoHazardMonitorTokenController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private String objStr(BaseCameraManagement baseCameraManagement, int status) {
|
|
|
+ private String objStr(MsgAlarmResp msgAlarmResp, int status) {
|
|
|
JSONObject obj = new JSONObject();
|
|
|
- obj.put("pipelineId", baseCameraManagement);
|
|
|
+ obj.put("pipelineId", msgAlarmResp);
|
|
|
obj.put("status", status);
|
|
|
return obj.toJSONString();
|
|
|
}
|