lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(auto-call): 修复自动呼叫任务取消问题 

- 在 AutoCallTaskScheduled 类中添加任务状态检查，避免继续执行已取消的任务- 优化 QXWarnController 中的代码格式，移除不必要的注释
master
李一帆 2025-08-21 16:46:08 +08:00
parent adf1a57079
commit 2cd86c4d6a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/whdc/component/AutoCallTaskScheduled.java
View File

@ -130,6 +130,11 @@ public class AutoCallTaskScheduled {
return; return;
} }
for (AutoCallPerson person : personList) { 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) { while (person.getUploadedTimes() < 2) {
if (AutoCallPerson.TAG_DONE.equals(person.getTag())) break; if (AutoCallPerson.TAG_DONE.equals(person.getTag())) break;
//do upload //do upload

4
src/main/java/com/whdc/controller/QXWarnController.java
View File

@ -149,7 +149,7 @@ public class QXWarnController {
/** /**
* 气象预警-正在生效的预警信息 * 气象预警-正在生效的预警信息
* *
* @param dto * @param
* @return * @return
*/ */
@ApiOperation(value = "气象预警-正在生效的预警信息") @ApiOperation(value = "气象预警-正在生效的预警信息")
@ -435,7 +435,7 @@ public class QXWarnController {
yearDto.setFilter(filter); yearDto.setFilter(filter);
String yearstr = HttpUtil.sendPost(getGroupWarning, JSON.toJSONString(yearDto)); String yearstr = HttpUtil.sendPost(getGroupWarning, JSON.toJSONString(yearDto));
JSONObject yearjson = JSON.parseObject(yearstr); JSONObject yearjson = JSON.parseObject(yearstr);
System.out.println("yearstr:" + yearjson); // System.out.println("yearstr:" + yearjson);
if (yearjson != null && yearjson.getInteger("code") == HttpStatus.SC_OK) { if (yearjson != null && yearjson.getInteger("code") == HttpStatus.SC_OK) {
List<WarningData> data = yearjson.getJSONArray("data").toJavaList(WarningData.class); List<WarningData> data = yearjson.getJSONArray("data").toJavaList(WarningData.class);
//// return ResultJson.ok(getCount(data, publishUnit, warnSignalLevel, warnSignalType)); //// return ResultJson.ok(getCount(data, publishUnit, warnSignalLevel, warnSignalType));