WFC/be.wfc
2
0
Fork 0
Code Activity

fix: 修复omada上云问题

Browse Source
This commit is contained in:
caiyuchao
2025-01-20 11:39:58 +08:00
parent 6c10050fe7
commit d17153ed50
10 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wfc-modules/wfc-job/src/main/java/org/wfc/job/controller/SysJobController.java
View File

@@ -20,7 +20,6 @@ import org.wfc.common.core.web.domain.AjaxResult;
import org.wfc.common.core.web.page.TableDataInfo;
import org.wfc.common.log.annotation.Log;
import org.wfc.common.log.enums.BusinessType;
//import org.wfc.common.security.annotation.RequiresPermissions;
import org.wfc.common.security.utils.SecurityUtils;
import org.wfc.job.domain.SysJob;
import org.wfc.job.service.ISysJobService;
@@ -176,9 +175,9 @@ public class SysJobController extends BaseController
{
SysJob sysJob = jobService.selectJobById(job.getJobId());
if (sysJob != null && sysJob.getInvokeTarget().contains("omadaTask")) {
R<Boolean> omadaResult = omadaTask.testOmadaApi();
if (omadaResult.getCode() != 200) {
return error(omadaResult.getMsg());
R<String> omadaResult = omadaTask.testOmadaApi();
if (!"success".equals(omadaResult.getData())) {
return error(omadaResult.getData());
}
}

4
wfc-modules/wfc-job/src/main/java/org/wfc/job/task/OmadaTask.java
View File

@@ -30,8 +30,8 @@ public class OmadaTask {
log.info("wifi定时任务执行成功, 耗时：{} 毫秒", endTime - startTime);
}
public R<Boolean> testOmadaApi() {
return remoteUserService.deviceJob();
public R<String> testOmadaApi() {
return remoteUserService.testJob();
}
public R<Boolean> initJob() {