|
@@ -24,6 +24,7 @@ import com.ozs.entity.SkynetHeartbeatLog;
|
|
import com.ozs.entity.TerminalIgnoreAlarm;
|
|
import com.ozs.entity.TerminalIgnoreAlarm;
|
|
import com.ozs.entity.VehiclePosition;
|
|
import com.ozs.entity.VehiclePosition;
|
|
import com.ozs.entity.vo.AlarmFilesVo;
|
|
import com.ozs.entity.vo.AlarmFilesVo;
|
|
|
|
+import com.ozs.entity.vo.AlarmHeartbeatLog;
|
|
import com.ozs.entity.vo.AlarmInfoVo;
|
|
import com.ozs.entity.vo.AlarmInfoVo;
|
|
import com.ozs.entity.vo.AlarmListVo;
|
|
import com.ozs.entity.vo.AlarmListVo;
|
|
import com.ozs.entity.vo.CameraPlayVo;
|
|
import com.ozs.entity.vo.CameraPlayVo;
|
|
@@ -41,6 +42,7 @@ import com.ozs.entity.vo.RespHeartbeatVo;
|
|
import com.ozs.entity.vo.SkynetHeartbeatVo;
|
|
import com.ozs.entity.vo.SkynetHeartbeatVo;
|
|
import com.ozs.entity.vo.TerminalIgnoreVo;
|
|
import com.ozs.entity.vo.TerminalIgnoreVo;
|
|
import com.ozs.framework.config.ServerConfig;
|
|
import com.ozs.framework.config.ServerConfig;
|
|
|
|
+import com.ozs.mapper.AlarmHeartbeatLogMapper;
|
|
import com.ozs.mapper.SkynetHeartbeatLogMapper;
|
|
import com.ozs.mapper.SkynetHeartbeatLogMapper;
|
|
import com.ozs.service.BaseCameraManagementService;
|
|
import com.ozs.service.BaseCameraManagementService;
|
|
import com.ozs.service.BaseRailwayManagementService;
|
|
import com.ozs.service.BaseRailwayManagementService;
|
|
@@ -136,6 +138,8 @@ public class GeoHazardMonitorTokenController {
|
|
WebSocketCommon webSocketCommon;
|
|
WebSocketCommon webSocketCommon;
|
|
@Resource
|
|
@Resource
|
|
private SkynetHeartbeatLogMapper synetHeartbeatLogMapper;
|
|
private SkynetHeartbeatLogMapper synetHeartbeatLogMapper;
|
|
|
|
+ @Resource
|
|
|
|
+ private AlarmHeartbeatLogMapper alarmHeartbeatLogMapper;
|
|
@Value("${base.env}")
|
|
@Value("${base.env}")
|
|
private String env;
|
|
private String env;
|
|
|
|
|
|
@@ -1161,7 +1165,6 @@ public class GeoHazardMonitorTokenController {
|
|
* 天网相机心跳监测接口定义
|
|
* 天网相机心跳监测接口定义
|
|
*/
|
|
*/
|
|
@PostMapping("/api/skynet/heartbeat")
|
|
@PostMapping("/api/skynet/heartbeat")
|
|
- @Transactional
|
|
|
|
public String skynetHeartbeat(@RequestBody ParameterVo parameterVo, HttpServletRequest request) {
|
|
public String skynetHeartbeat(@RequestBody ParameterVo parameterVo, HttpServletRequest request) {
|
|
String token = apiTokenUtils.getGeoHazardMonitorToken(request);
|
|
String token = apiTokenUtils.getGeoHazardMonitorToken(request);
|
|
log.info("token:{}", token);
|
|
log.info("token:{}", token);
|
|
@@ -1234,6 +1237,56 @@ public class GeoHazardMonitorTokenController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 第三方报警系统心跳监测接口定义
|
|
|
|
+ */
|
|
|
|
+ @PostMapping("/api/alarm/heartbeat")
|
|
|
|
+ public String alarmHeartbeat(@RequestBody ParameterVo parameterVo, HttpServletRequest request) {
|
|
|
|
+ String token = apiTokenUtils.getGeoHazardMonitorToken(request);
|
|
|
|
+ log.info("token:{}", token);
|
|
|
|
+ log.info("parameter:{}", parameterVo);
|
|
|
|
+ JSONObject jsonObject = new JSONObject();
|
|
|
|
+ if (StringUtils.isNotEmpty(token)) {
|
|
|
|
+ String[] split = token.split("-");
|
|
|
|
+ String key = split[split.length - 1];
|
|
|
|
+ String s = SM4Utils.decryptData_ECB(parameterVo.getParameter(), key);
|
|
|
|
+ SvcAddress svcAddress = JSON.parseObject(s, SvcAddress.class);
|
|
|
|
+ if (ObjectUtils.isEmpty(svcAddress.getGrantType())) {
|
|
|
|
+ jsonObject.put("resultCode", 0);
|
|
|
|
+ jsonObject.put("message", "失败");
|
|
|
|
+ jsonObject.put("data", "授权类型不能为空");
|
|
|
|
+ return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
|
|
|
|
+ }
|
|
|
|
+ if (ObjectUtils.isEmpty(svcAddress.getClientId())) {
|
|
|
|
+ jsonObject.put("resultCode", 0);
|
|
|
|
+ jsonObject.put("message", "失败");
|
|
|
|
+ jsonObject.put("data", "客户端编号不能为空");
|
|
|
|
+ return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
|
|
|
|
+ }
|
|
|
|
+ AlarmHeartbeatLog alarmHeartbeatLog =new AlarmHeartbeatLog();
|
|
|
|
+ alarmHeartbeatLog.setClientId(svcAddress.getClientId());
|
|
|
|
+ alarmHeartbeatLog.setGrantType(svcAddress.getGrantType());
|
|
|
|
+ if (alarmHeartbeatLogMapper.insert(alarmHeartbeatLog)>0){
|
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
|
+ map.put("cameraCode", svcAddress.getClientId());
|
|
|
|
+ jsonObject.put("resultCode", 1);
|
|
|
|
+ jsonObject.put("message", "ok");
|
|
|
|
+ jsonObject.put("data", map);
|
|
|
|
+ return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
|
|
|
|
+ }else {
|
|
|
|
+ jsonObject.put("resultCode", 0);
|
|
|
|
+ jsonObject.put("message", "失败");
|
|
|
|
+ jsonObject.put("data", "新增失败");
|
|
|
|
+ return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ jsonObject.put("resultCode", 2);
|
|
|
|
+ jsonObject.put("message", "失败");
|
|
|
|
+ jsonObject.put("data", "token验证失败");
|
|
|
|
+ return JSONObject.toJSONString(jsonObject);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
@GetMapping("/test/{key}")
|
|
@GetMapping("/test/{key}")
|
|
public void test(@PathVariable String key) {
|
|
public void test(@PathVariable String key) {
|
|
String heartbeat = heartbeatUtils.getHeartbeat(key);
|
|
String heartbeat = heartbeatUtils.getHeartbeat(key);
|
|
@@ -1263,10 +1316,8 @@ public class GeoHazardMonitorTokenController {
|
|
|
|
|
|
public static void main(String[] args) {
|
|
public static void main(String[] args) {
|
|
JSONObject res = new JSONObject();
|
|
JSONObject res = new JSONObject();
|
|
- res.put("railwayCode", "SHTL");
|
|
|
|
- res.put("lineDir", 1);
|
|
|
|
- res.put("cameraCode", "42010001541320000023");
|
|
|
|
- res.put("installMile", 3000);
|
|
|
|
|
|
+ res.put("grantType", "1");
|
|
|
|
+ res.put("clientId", "1005");
|
|
String s = SM4Utils.encryptData_ECB(JSONObject.toJSONString(res), "4370780c9a8c43e5");
|
|
String s = SM4Utils.encryptData_ECB(JSONObject.toJSONString(res), "4370780c9a8c43e5");
|
|
System.out.println(s);
|
|
System.out.println(s);
|
|
}
|
|
}
|