Commit e0ee7bcc authored by 赵啸非's avatar 赵啸非

添加设备相关

parent 1c185a09
Pipeline #2527 failed with stages
...@@ -9,4 +9,10 @@ ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `deviceCode` varchar(255) ...@@ -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 `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 `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 `idName` varchar(64) default '' COMMENT '身份证名称' AFTER idCard;
ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `mobile` varchar(64) default '' COMMENT '手机号码' AFTER idName; ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `mobile` varchar(64) default '' COMMENT '手机号码' AFTER idName;
\ No newline at end of file
-- ----------------------------
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);
...@@ -51,13 +51,13 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService { ...@@ -51,13 +51,13 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
siteRest.getData().forEach(site -> { siteRest.getData().forEach(site -> {
log.info("站点名称:{}",site.getSiteName()); log.info("站点名称:{}",site.getSiteName());
DevicePdu devicePdu = new DevicePdu(); DevicePdu devicePdu = new DevicePdu();
devicePdu.setProductCode("ybj"); devicePdu.setProductCode("tdj");
devicePdu.setSize(-1); devicePdu.setSize(-1);
Rest<RespData<List<DevicePdu>>> deviceRest = deviceFeign.list(devicePdu); Rest<RespData<List<DevicePdu>>> deviceRest = deviceFeign.list(devicePdu);
log.info("deviceRest:{}",JSON.toJSONString(deviceRest)); log.info("deviceRest:{}",JSON.toJSONString(deviceRest));
if (YesNoEnum.YES.getValue() == deviceRest.getCode()) { if (YesNoEnum.YES.getValue() == deviceRest.getCode()) {
List<DevicePdu> devicePduList = deviceRest.getData().getData(); List<DevicePdu> devicePduList = deviceRest.getData().getData();
log.info("样表机总数量:{}", devicePduList.size()); log.info("填单机总数量:{}", devicePduList.size());
if (!ObjectUtils.isEmpty(devicePduList)) { if (!ObjectUtils.isEmpty(devicePduList)) {
List<DeviceEntity> newDeviceList = devicePduList.stream().map(newDevice -> { List<DeviceEntity> newDeviceList = devicePduList.stream().map(newDevice -> {
DeviceEntity deviceEntity = new DeviceEntity(); DeviceEntity deviceEntity = new DeviceEntity();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment