From e0ee7bcc9054cdcd31edfe6d802ae2aa7131c41c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com> Date: Fri, 24 Mar 2023 09:57:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fill-manager/db/add.sql | 8 +++++++- .../mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/fill-manager/db/add.sql b/fill-manager/db/add.sql index 89b1b5f..a6c2e4a 100644 --- a/fill-manager/db/add.sql +++ b/fill-manager/db/add.sql @@ -9,4 +9,10 @@ ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `deviceCode` varchar(255) ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `deviceName` varchar(255) default '' COMMENT '璁惧鍚嶇О' AFTER deviceCode; ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `idCard` varchar(64) default '' COMMENT '韬唤璇佸彿' AFTER deviceName; ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `idName` varchar(64) default '' COMMENT '韬唤璇佸悕绉�' AFTER idCard; -ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `mobile` varchar(64) default '' COMMENT '鎵嬫満鍙风爜' AFTER idName; \ No newline at end of file +ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `mobile` varchar(64) default '' COMMENT '鎵嬫満鍙风爜' AFTER idName; + + +-- ---------------------------- +2023-03-22 +-- ---------------------------- +INSERT INTO `mortals_xhx_task` (`id`, `name`, `taskKey`, `status`, `excuteService`, `excuteParam`, `excuteHost`, `excuteStrategy`, `excuteDate`, `excuteTime`, `remark`, `lastExcuteHost`, `lastExcuteTime`, `interimExcuteStatus`, `createTime`, `createUserId`, `createUserName`) VALUES ('4', '鍚屾璁惧', 'SyncSiteDeviceTask', '0', 'SyncSiteDeviceTask', NULL, NULL, '4', '120', '00:00', NULL, '127.0.1.1', '2023-02-26 22:15:59', '0', '2023-02-25 14:34:12', '1', NULL); diff --git a/fill-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java b/fill-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java index 76c78f8..72e9533 100644 --- a/fill-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java +++ b/fill-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java @@ -51,13 +51,13 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService { siteRest.getData().forEach(site -> { log.info("绔欑偣鍚嶇О:{}",site.getSiteName()); DevicePdu devicePdu = new DevicePdu(); - devicePdu.setProductCode("ybj"); + devicePdu.setProductCode("tdj"); devicePdu.setSize(-1); Rest<RespData<List<DevicePdu>>> deviceRest = deviceFeign.list(devicePdu); log.info("deviceRest锛歿}",JSON.toJSONString(deviceRest)); if (YesNoEnum.YES.getValue() == deviceRest.getCode()) { List<DevicePdu> devicePduList = deviceRest.getData().getData(); - log.info("鏍疯〃鏈烘€绘暟閲忥細{}", devicePduList.size()); + log.info("濉崟鏈烘€绘暟閲忥細{}", devicePduList.size()); if (!ObjectUtils.isEmpty(devicePduList)) { List<DeviceEntity> newDeviceList = devicePduList.stream().map(newDevice -> { DeviceEntity deviceEntity = new DeviceEntity(); -- 2.24.3