From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送

---
 src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
index 4fa71e6..3885146 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -17,7 +17,6 @@
 package org.springblade.modules.task.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -26,16 +25,16 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.itextpdf.text.log.Logger;
 import com.itextpdf.text.log.LoggerFactory;
+import com.xxl.job.core.enums.taskHandlerEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.constant.DictConstant;
 import org.springblade.common.param.CommonParamSet;
 import org.springblade.common.utils.SpringUtils;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.modules.category.entity.CategoryEntity;
 import org.springblade.modules.category.service.ICategoryService;
+import org.springblade.modules.threeColorTask.entity.CustomTaskEntity;
 import org.springblade.modules.grid.entity.GridEntity;
 import org.springblade.modules.grid.entity.GridWorkLogEntity;
 import org.springblade.modules.grid.service.IGridService;
@@ -389,9 +388,10 @@
 	@Transactional(rollbackFor = Exception.class)
 	public boolean createTaskJob(String param) {
 		// 解析参数
-		JSONObject jsonParam = JSON.parseObject(param);
+		CustomTaskEntity customTaskEntity = JSON.parseObject(param, CustomTaskEntity.class);
+		// CustomTaskEntity customTaskEntity = new CustomTaskEntity();
 //		String params = jsonParam.getString("params");
-		boolean flag = false;
+// 		boolean flag = false;
 		// 校园安全自查任务生成
 //		createCampusReportingTask();
 		// 打金店/二手车/二手手机任务生成
@@ -399,9 +399,11 @@
 		// 旅馆安全自查任务生成
 //		createHotelReportingTask();
 		// 人员类-肇事肇祸精神障碍患者走访任务生成
-		createGridWordTask();
+		// createGridWordTask();
 		// 返回
-		return flag;
+		TaskHandle handler = (TaskHandle) SpringUtils.getBean(Objects.requireNonNull(taskHandlerEnum.getNameByCode(customTaskEntity.getTaskType())));
+		handler.taskHandle(customTaskEntity);
+		return true;
 	}
 
 

--
Gitblit v1.9.3