|
@@ -134,7 +134,9 @@ public class GeoHazardMonitorTokenController {
|
|
jsonObject.put("data", "你填写的报警病害属性不符合规则!!!");
|
|
jsonObject.put("data", "你填写的报警病害属性不符合规则!!!");
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
|
|
}
|
|
}
|
|
- reqMsgAlarmVo.setAlarmTime(reqMsgAlarmVo.getAlarmTime() * 1000);
|
|
|
|
|
|
+ if (reqMsgAlarmVo.getAlarmTime().toString().length() == 10) {
|
|
|
|
+ reqMsgAlarmVo.setAlarmTime(reqMsgAlarmVo.getAlarmTime() * 1000);
|
|
|
|
+ }
|
|
log.info("reqMsgAlarmVo:{}", reqMsgAlarmVo);
|
|
log.info("reqMsgAlarmVo:{}", reqMsgAlarmVo);
|
|
|
|
|
|
RespMsgAlarmVo respMsgAlarmVo = new RespMsgAlarmVo();
|
|
RespMsgAlarmVo respMsgAlarmVo = new RespMsgAlarmVo();
|
|
@@ -144,7 +146,7 @@ public class GeoHazardMonitorTokenController {
|
|
}
|
|
}
|
|
BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(wrapper);
|
|
BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(wrapper);
|
|
log.info("baseCameraManagement:{}", baseCameraManagement);
|
|
log.info("baseCameraManagement:{}", baseCameraManagement);
|
|
- if (ObjectUtils.isEmpty(baseCameraManagement)){
|
|
|
|
|
|
+ if (ObjectUtils.isEmpty(baseCameraManagement)) {
|
|
jsonObject.put("resultCode", 2);
|
|
jsonObject.put("resultCode", 2);
|
|
jsonObject.put("message", "失败");
|
|
jsonObject.put("message", "失败");
|
|
jsonObject.put("data", "你填写的相机编码不存在!!!");
|
|
jsonObject.put("data", "你填写的相机编码不存在!!!");
|