From 4b81bce46732b5c057ff12c2b0f3c03448cc1a9b Mon Sep 17 00:00:00 2001
From: zhaoxianglong <you@example.com>
Date: Fri, 26 Apr 2024 23:41:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9A=E6=97=B6=E7=AE=A1?=
 =?UTF-8?q?=E6=8E=A7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zc/business/controller/DcDeviceController.java |  2 ++
 .../com/zc/business/domain/DcBatchFunctionsJob.java    |  5 ++++-
 .../service/impl/DcBatchFunctionsJobServiceImpl.java   | 10 +++-------
 .../com/zc/business/utils/ScheduledTaskScheduling.java |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
index f18cefdd..fbb92c93 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
@@ -604,6 +604,8 @@ public class DcDeviceController extends BaseController {
                                       @ApiParam(value="方向", name="direction", required=true) @RequestParam ("direction") String direction){
         return dcDeviceService.selectNearBoard(stakeMark,direction);
     }
+
+    @OperationLog(operUrl = "/business/device/batchFunctions")
     public void batchInvokedFunction(Object object) throws HttpException, IOException, InterruptedException {
         Map<String, Object> map = new ObjectMapper().convertValue(object, Map.class);
         batchInvokedFunction(map);
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcBatchFunctionsJob.java b/zc-business/src/main/java/com/zc/business/domain/DcBatchFunctionsJob.java
index 3bbb6d09..ea43a28f 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcBatchFunctionsJob.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcBatchFunctionsJob.java
@@ -12,9 +12,12 @@ import java.util.Date;
 public class DcBatchFunctionsJob {
 
     //@TableId(value = "jobId", type = IdType.AUTO)
-    private Integer jobId;
+    private Long jobId;
     @ApiModelProperty("任务组ID")
     private String jobGroup;
+    //@Excel(name = "任务名称")
+    @TableField(exist = false)
+    private String jobName;
     @ApiModelProperty("调用目标字符串")
     private String invokeTarget;
     @ApiModelProperty("调用参数")
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcBatchFunctionsJobServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcBatchFunctionsJobServiceImpl.java
index 4be890a1..02f366f3 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcBatchFunctionsJobServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcBatchFunctionsJobServiceImpl.java
@@ -99,7 +99,7 @@ public class DcBatchFunctionsJobServiceImpl extends ServiceImpl<DcBatchFunctions
             }
             dcBatchFunctionsJobGroup.setDetailedConfiguration(String.valueOf(detailedConfigurations));
             dcBatchFunctionsJobGroupService.editDcBatchFunctionsJobGroup(dcBatchFunctionsJobGroup);
-            dcBatchFunctionsJob.setJobId(id);
+            dcBatchFunctionsJob.setJobId(Long.valueOf(id));
             dcBatchFunctionsJob.setCreateTime(new Date());
             createScheduleJob(dcBatchFunctionsJob);
             boolean save = save(dcBatchFunctionsJob);
@@ -150,7 +150,7 @@ public class DcBatchFunctionsJobServiceImpl extends ServiceImpl<DcBatchFunctions
     public boolean removeDcBatchFunctionsJob(List<String> ids) throws SchedulerException, TaskException {
         for (String id : ids) {
             DcBatchFunctionsJob job = new DcBatchFunctionsJob();
-            job.setJobId(Integer.valueOf(id));
+            job.setJobId(Long.valueOf(id));
             List<DcBatchFunctionsJob> dcBatchFunctionsJobs = listDcBatchFunctionsJob(job);
             if (dcBatchFunctionsJobs.size() == 0) {
                 return false;
@@ -247,11 +247,7 @@ public class DcBatchFunctionsJobServiceImpl extends ServiceImpl<DcBatchFunctions
         });
         dcBatchFunctionsJobGroup.setDetailedConfiguration(detailedConfiguration.toString());
         DcBatchFunctionsJobGroup dcBatchFunctionsJobGroup1 = dcBatchFunctionsJobGroupService.editDcBatchFunctionsJobGroup(dcBatchFunctionsJobGroup);
-        if (dcBatchFunctionsJobGroup1 != null) {
-            return true;
-        } else {
-            return false;
-        }
+        return dcBatchFunctionsJobGroup1 != null;
     }
 }
 
diff --git a/zc-business/src/main/java/com/zc/business/utils/ScheduledTaskScheduling.java b/zc-business/src/main/java/com/zc/business/utils/ScheduledTaskScheduling.java
index c6c293db..401f5af5 100644
--- a/zc-business/src/main/java/com/zc/business/utils/ScheduledTaskScheduling.java
+++ b/zc-business/src/main/java/com/zc/business/utils/ScheduledTaskScheduling.java
@@ -14,7 +14,7 @@ public class ScheduledTaskScheduling extends AbstractQuartzJob {
     protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception {
         ScheduledTaskSchedulingTask scheduledTaskSchedulingTask = new ScheduledTaskSchedulingTask();
         DcBatchFunctionsJob dcBatchFunctionsJob = new DcBatchFunctionsJob();
-        dcBatchFunctionsJob.setJobId(Math.toIntExact(sysJob.getJobId()));
+        dcBatchFunctionsJob.setJobId(sysJob.getJobId());
         scheduledTaskSchedulingTask.invokeTarget(dcBatchFunctionsJob);
     }
 }