From f293b38479d10d9f139f6a70808fc053a22f160c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 11 十月 2024 15:12:03 +0800
Subject: [PATCH] 最新版本
---
admin/src/views/timer/components/OperaTimerWindow.vue | 8 ++++----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/timer/components/OperaTimerWindow.vue b/admin/src/views/timer/components/OperaTimerWindow.vue
index f3e8b6d..3bf5d10 100644
--- a/admin/src/views/timer/components/OperaTimerWindow.vue
+++ b/admin/src/views/timer/components/OperaTimerWindow.vue
@@ -8,16 +8,16 @@
>
<el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�">
<el-form-item label="Bean鍚嶇О" prop="beanName">
- <el-input v-model="form.beanName" placeholder="璇疯緭鍏ean鍚嶇О" :maxlength="10" v-trim/>
+ <el-input v-model="form.beanName" placeholder="璇疯緭鍏ean鍚嶇О" v-trim/>
</el-form-item>
<el-form-item label="妯″潡鍚嶇О" prop="module">
- <el-input v-model="form.module" placeholder="璇疯緭鍏ユā鍧楀悕绉�" :maxlength="10" v-trim/>
+ <el-input v-model="form.module" placeholder="璇疯緭鍏ユā鍧楀悕绉�" v-trim/>
</el-form-item>
<el-form-item label="Cron琛ㄨ揪寮�" prop="cronExpres">
- <el-input v-model="form.cronExpres" placeholder="璇疯緭鍏ron琛ㄨ揪寮�" :maxlength="10" v-trim/>
+ <el-input v-model="form.cronExpres" placeholder="璇疯緭鍏ron琛ㄨ揪寮�" v-trim/>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" :maxlength="10" v-trim/>
+ <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" v-trim/>
</el-form-item>
<el-form-item label="鎵ц鍙傛暟" prop="params">
<el-input v-model="form.params" type="textarea" placeholder="璇疯緭鍏ユ墽琛屽弬鏁�" v-trim/>
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java
index c3a8437..ec7fc9d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java
@@ -62,7 +62,7 @@
List<PlatformDevice> deviceList = new ArrayList<>();
Date date = new Date();
//鏌ヨ鍏ㄩ儴闂ㄧ璁惧鏁版嵁
- List<Platform> allList = platformMapper.selectList(null);
+ List<Platform> allList = platformMapper.selectList(new QueryWrapper<Platform>().lambda().eq(Platform::getIsdeleted,Constants.ZERO));
List<PlatformListInfoResponse> allHkList = getAllHkList(param);
/**
* 鑾峰彇澧炲垹鏀规暟鎹泦鍚�
@@ -85,6 +85,7 @@
,Constants.PlatformJobStatus.CANCEL.getKey() )
.in(PlatformJob::getPlatformId,platIds)
.set(PlatformJob::getPlatformId,null)
+ .set(PlatformJob::getPlatforms,null)
.set(PlatformJob::getStatus,Constants.PlatformJobStatus.WART_SIGN_IN.getKey())
);
}
--
Gitblit v1.9.3