From 9db1c6c261049fbdcb104e6c0e07fa544bb42013 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期三, 14 五月 2025 18:28:14 +0800
Subject: [PATCH] 代码BUG（预警解析异常）
---
src/main/java/com/product/administration/service/EarlyWarningManagerService.java | 91 ++++++++++++++++++++++++---------------------
1 files changed, 49 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/product/administration/service/EarlyWarningManagerService.java b/src/main/java/com/product/administration/service/EarlyWarningManagerService.java
index 876d16a..971f0c0 100644
--- a/src/main/java/com/product/administration/service/EarlyWarningManagerService.java
+++ b/src/main/java/com/product/administration/service/EarlyWarningManagerService.java
@@ -171,32 +171,37 @@
*/
@Transactional
public String addWarning(FieldSetEntity fse) throws BaseException, SchedulerException, TaskException {
- FieldSetEntity fseJob = new FieldSetEntity();
- fseJob.setTableName("product_sys_timed_task");
- fseJob.setValue("concurrent", 1);
- fseJob.setValue("job_name", fse.getString("config_name"));
- fseJob.setValue("cron_expression", fse.getString("execution_frequency"));
- fseJob.setValue("invoke_target", "warnTask.triggerSingleWarningTask('null')");
- fseJob.setValue("job_group", "system");
- fseJob.setValue("misfire_policy", 2);
- fseJob.setValue("remark", "");
- if (fse.getInteger("config_status") == 0) {
- fseJob.setValue("status", 0);
- } else {
- fseJob.setValue("status", 1);
- }
- fseJob.setValue("is_conceal", 1);
- sysJobService.insertJob(fseJob);
-
- fse.setValue("time_task_uuid", fseJob.getUUID());
fse.setValue(CmnConst.CREATED_BY, SpringMVCContextHolder.getCurrentUser().getUser_id());
fse.setValue(CmnConst.CREATED_UTC_DATETIME, new Date());
- String uuid = baseDao.add(fse);
+ if (fse.getString("type").equals("0")){
+ FieldSetEntity fseJob = new FieldSetEntity();
+ fseJob.setTableName("product_sys_timed_task");
+ fseJob.setValue("concurrent", 1);
+ fseJob.setValue("job_name", fse.getString("config_name"));
+ fseJob.setValue("cron_expression", fse.getString("execution_frequency"));
+ fseJob.setValue("invoke_target", "warnTask.triggerSingleWarningTask('null')");
+ fseJob.setValue("job_group", "system");
+ fseJob.setValue("misfire_policy", 2);
+ fseJob.setValue("remark", "");
+ if (fse.getInteger("config_status") == 0) {
+ fseJob.setValue("status", 0);
+ } else {
+ fseJob.setValue("status", 1);
+ }
+ fseJob.setValue("is_conceal", 1);
+ sysJobService.insertJob(fseJob);
- fseJob.setValue("invoke_target", "warnTask.triggerSingleWarningTask('" + fse.getUUID() + "')");
- sysJobService.updateJob(fseJob);
+ fse.setValue("time_task_uuid", fseJob.getUUID());
- return uuid;
+ String uuid = baseDao.add(fse);
+
+ fseJob.setValue("invoke_target", "warnTask.triggerSingleWarningTask('" + fse.getUUID() + "')");
+ sysJobService.updateJob(fseJob);
+ return uuid;
+ }else {
+ return baseDao.add(fse);
+
+ }
}
/**
@@ -210,26 +215,27 @@
*/
@Transactional
public boolean updateWarning(FieldSetEntity fse) throws BaseException, SchedulerException, TaskException {
- FieldSetEntity fseJob = new FieldSetEntity();
- fseJob.setTableName("product_sys_timed_task");
- fseJob.setValue("concurrent", 1);
- fseJob.setValue("job_name", fse.getString("config_name"));
- fseJob.setValue("cron_expression", fse.getString("execution_frequency"));
- fseJob.setValue("invoke_target", "warnTask.triggerSingleWarningTask('" + fse.getUUID() + "')");
- fseJob.setValue("job_group", "system");
- fseJob.setValue("misfire_policy", 2);
- fseJob.setValue("remark", "");
- if (fse.getInteger("config_status") == 0) {
- fseJob.setValue("status", 0);
- sysJobService.pauseJob(fse.getString("time_task_uuid"));
- } else {
- fseJob.setValue("status", 1);
- sysJobService.resumeJob(fse.getString("time_task_uuid"));
+ if (fse.getString("type").equals("0")) {
+ FieldSetEntity fseJob = new FieldSetEntity();
+ fseJob.setTableName("product_sys_timed_task");
+ fseJob.setValue("concurrent", 1);
+ fseJob.setValue("job_name", fse.getString("config_name"));
+ fseJob.setValue("cron_expression", fse.getString("execution_frequency"));
+ fseJob.setValue("invoke_target", "warnTask.triggerSingleWarningTask('" + fse.getUUID() + "')");
+ fseJob.setValue("job_group", "system");
+ fseJob.setValue("misfire_policy", 2);
+ fseJob.setValue("remark", "");
+ if (fse.getInteger("config_status") == 0) {
+ fseJob.setValue("status", 0);
+ sysJobService.pauseJob(fse.getString("time_task_uuid"));
+ } else {
+ fseJob.setValue("status", 1);
+ sysJobService.resumeJob(fse.getString("time_task_uuid"));
+ }
+ fseJob.setValue("is_conceal", 1);
+ fseJob.setValue("uuid", fse.getString("time_task_uuid"));
+ sysJobService.updateJob(fseJob);
}
- fseJob.setValue("is_conceal", 1);
- fseJob.setValue("uuid", fse.getString("time_task_uuid"));
- sysJobService.updateJob(fseJob);
-
fse.setValue(CmnConst.UPDATED_BY, SpringMVCContextHolder.getCurrentUser().getUser_id());
fse.setValue(CmnConst.UPDATED_UTC_DATETIME, new Date());
return baseDao.update(fse);
@@ -332,6 +338,8 @@
StaffManagerService staffManagerService;
public void sendWarnFeedBackMessage(FieldSetEntity fse) throws BaseException {
+ String userId = String.valueOf(SpringMVCContextHolder.getCurrentUser().getUser_id());
+ fse.setValue( CmnConst.USER_ID,userId);//褰撳墠浜轰綔涓烘秷鎭彂閫佷汉锛屽叾瀹冮璀︽帴鏀朵汉浣滀负鏀舵秷鎭汉
String parent_uuid = fse.getString("puuid");
Set<String> receiverSet = this.getReceiver(fse.getString("parent_uuid"));
if (StringUtils.isEmpty(parent_uuid)) {
@@ -340,7 +348,6 @@
if (!StringUtils.isEmpty(leaderUserId)) {
receiverSet.add(leaderUserId);
}
- String userId = String.valueOf(SpringMVCContextHolder.getCurrentUser().getUser_id());
receiverSet.remove(userId);
if(receiverSet.isEmpty()){
logger.error("鍙戦�佹秷鎭�,澶辫触");
--
Gitblit v1.9.2