|
@@ -1724,11 +1724,11 @@ public class GeoHazardMonitorTokenController {
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
}
|
|
}
|
|
if (ObjectUtils.isEmpty(preAlarmResponse.getPreAlarmNum())) {
|
|
if (ObjectUtils.isEmpty(preAlarmResponse.getPreAlarmNum())) {
|
|
- AjaxResults1 = new AjaxResults(0, "预警目标个数不难为空");
|
|
|
|
|
|
+ AjaxResults1 = new AjaxResults(0, "预警目标个数不能为空");
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
}
|
|
}
|
|
if (ObjectUtils.isEmpty(preAlarmResponse.getPreAlarmTime())) {
|
|
if (ObjectUtils.isEmpty(preAlarmResponse.getPreAlarmTime())) {
|
|
- AjaxResults1 = new AjaxResults(0, "预警时间不难为空");
|
|
|
|
|
|
+ AjaxResults1 = new AjaxResults(0, "预警时间不能为空");
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
}
|
|
}
|
|
if (!preAlarmResponse.getPreAlarmTime().toString().matches(REGEX)) {
|
|
if (!preAlarmResponse.getPreAlarmTime().toString().matches(REGEX)) {
|
|
@@ -1736,24 +1736,24 @@ public class GeoHazardMonitorTokenController {
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
}
|
|
}
|
|
if (ObjectUtils.isEmpty(preAlarmResponse.getPreAlarmList())) {
|
|
if (ObjectUtils.isEmpty(preAlarmResponse.getPreAlarmList())) {
|
|
- AjaxResults1 = new AjaxResults(0, "预警目标集合不难为空");
|
|
|
|
|
|
+ AjaxResults1 = new AjaxResults(0, "预警目标集合不能为空");
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
}
|
|
}
|
|
for (PreAlarmResponse.PreAlarmList preAlarmList : preAlarmResponse.getPreAlarmList()) {
|
|
for (PreAlarmResponse.PreAlarmList preAlarmList : preAlarmResponse.getPreAlarmList()) {
|
|
if (ObjectUtils.isEmpty(preAlarmList.getContent())) {
|
|
if (ObjectUtils.isEmpty(preAlarmList.getContent())) {
|
|
- AjaxResults1 = new AjaxResults(0, "预警内容不难为空");
|
|
|
|
|
|
+ AjaxResults1 = new AjaxResults(0, "预警内容不能为空");
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
}
|
|
}
|
|
if (ObjectUtils.isEmpty(preAlarmList.getDistance())) {
|
|
if (ObjectUtils.isEmpty(preAlarmList.getDistance())) {
|
|
- AjaxResults1 = new AjaxResults(0, "目标点离机车的距离不难为空");
|
|
|
|
|
|
+ AjaxResults1 = new AjaxResults(0, "目标点离机车的距离不能为空");
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
}
|
|
}
|
|
if (ObjectUtils.isEmpty(preAlarmList.getLevel())) {
|
|
if (ObjectUtils.isEmpty(preAlarmList.getLevel())) {
|
|
- AjaxResults1 = new AjaxResults(0, "预警级别不难为空");
|
|
|
|
|
|
+ AjaxResults1 = new AjaxResults(0, "预警级别不能为空");
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
}
|
|
}
|
|
if (ObjectUtils.isEmpty(preAlarmList.getTargetType())) {
|
|
if (ObjectUtils.isEmpty(preAlarmList.getTargetType())) {
|
|
- AjaxResults1 = new AjaxResults(0, "预警目标点类型不难为空");
|
|
|
|
|
|
+ AjaxResults1 = new AjaxResults(0, "预警目标点类型不能为空");
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
|
|
}
|
|
}
|
|
}
|
|
}
|