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 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 ids) throws SchedulerException, TaskException { for (String id : ids) { DcBatchFunctionsJob job = new DcBatchFunctionsJob(); - job.setJobId(Integer.valueOf(id)); + job.setJobId(Long.valueOf(id)); List dcBatchFunctionsJobs = listDcBatchFunctionsJob(job); if (dcBatchFunctionsJobs.size() == 0) { return false; @@ -247,11 +247,7 @@ public class DcBatchFunctionsJobServiceImpl extends ServiceImpl