fix(auto-call): 修复自动呼叫任务取消问题
- 在 AutoCallTaskScheduled 类中添加任务状态检查,避免继续执行已取消的任务- 优化 QXWarnController 中的代码格式,移除不必要的注释master
parent
adf1a57079
commit
2cd86c4d6a
|
|
@ -130,6 +130,11 @@ public class AutoCallTaskScheduled {
|
|||
return;
|
||||
}
|
||||
for (AutoCallPerson person : personList) {
|
||||
AutoCallTask task = autoCallTaskService.getTaskMapper().selectById(taskId);
|
||||
if (task.getStatus() == AutoCallTask.STATUS_MANUAL_CLOSE || task.getStatus() == AutoCallTask.STATUS_CANCELLED) {
|
||||
autoCallTaskService.cancelPerson(person);
|
||||
continue;
|
||||
}
|
||||
while (person.getUploadedTimes() < 2) {
|
||||
if (AutoCallPerson.TAG_DONE.equals(person.getTag())) break;
|
||||
//do upload
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ public class QXWarnController {
|
|||
/**
|
||||
* 气象预警-正在生效的预警信息
|
||||
*
|
||||
* @param dto
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "气象预警-正在生效的预警信息")
|
||||
|
|
@ -435,7 +435,7 @@ public class QXWarnController {
|
|||
yearDto.setFilter(filter);
|
||||
String yearstr = HttpUtil.sendPost(getGroupWarning, JSON.toJSONString(yearDto));
|
||||
JSONObject yearjson = JSON.parseObject(yearstr);
|
||||
System.out.println("yearstr:" + yearjson);
|
||||
// System.out.println("yearstr:" + yearjson);
|
||||
if (yearjson != null && yearjson.getInteger("code") == HttpStatus.SC_OK) {
|
||||
List<WarningData> data = yearjson.getJSONArray("data").toJavaList(WarningData.class);
|
||||
//// return ResultJson.ok(getCount(data, publishUnit, warnSignalLevel, warnSignalType));
|
||||
|
|
|
|||
Loading…
Reference in New Issue