From ff181c2aa05e14248b377938b280e04b32790a4a Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Sat, 16 Oct 2021 20:56:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E9=99=90=E9=87=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TruckWeightLimitSyncService.java | 31 ++++++++++--------- .../ssjygl/synctask/SyncTaskService.java | 6 ++++ 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java index 75b7cc0..859bbf2 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java @@ -101,8 +101,6 @@ public class TruckWeightLimitSyncService extends BaseSyncService { oldobj.set(key, model.get(key)); } - model.setCreateUserId(oldobj.getCreateUserId()); - model.setCreateTime(oldobj.getCreateTime()); SyncTask synctask = new SyncTask(); boolean ret = Db.tx(new IAtom() { @@ -145,16 +143,16 @@ public class TruckWeightLimitSyncService extends BaseSyncService { } public Result delete(String truck_license, Sysuser sysuser) { - TruckWeightLimit model = TruckWeightLimit.dao.findById(truck_license); - if (model == null) { + TruckWeightLimit oldobj = TruckWeightLimit.dao.findById(truck_license); + if (oldobj == null) { return Result.failed(false, "按主键未找到对应记录"); } - if (!model.hasDelKey()) { + if (!oldobj.hasDelKey()) { return Result.failed(false, "不存在逻辑删除字段"); } - TruckWeightLimit oldobj = model.clone(); + TruckWeightLimit saveold = oldobj.clone(); oldobj.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_INVALID); // 逻辑删除字段统一用 del SyncTask synctask = new SyncTask(); @@ -164,9 +162,9 @@ public class TruckWeightLimitSyncService extends BaseSyncService { try { TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog(); modifyLog.setUuid(StrKit.getRandomUUID()); - modifyLog.setTruckLicense(model.getTruckLicense()); - modifyLog.setWeightLimit(model.getWeightLimit()); - modifyLog.setAttachment(model.getAttachment()); + modifyLog.setTruckLicense(oldobj.getTruckLicense()); + modifyLog.setWeightLimit(oldobj.getWeightLimit()); + modifyLog.setAttachment(oldobj.getAttachment()); modifyLog.setState(3); modifyLog.setChangeUserId(sysuser.getId()); modifyLog.setChangeUserName(sysuser.getName()); @@ -179,7 +177,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService { synctask.addSaveData(modifyLog); return SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser) + && ModifyLogService.me.save(oldobj, saveold, Enums.DataOpType.UPDATE.getId(), sysuser) && ModifyLogService.me.save(modifyLog, null, Enums.DataOpType.SAVE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); @@ -209,6 +207,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService { return Result.failed(false, "不存在逻辑删除字段"); } + TruckWeightLimit saveold = oldobj.clone(); oldobj.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_VALID); // 逻辑删除字段统一用 del SyncTask synctask = new SyncTask(); @@ -219,9 +218,9 @@ public class TruckWeightLimitSyncService extends BaseSyncService { try { TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog(); modifyLog.setUuid(StrKit.getRandomUUID()); - modifyLog.setTruckLicense(model.getTruckLicense()); - modifyLog.setWeightLimit(model.getWeightLimit()); - modifyLog.setAttachment(model.getAttachment()); + modifyLog.setTruckLicense(oldobj.getTruckLicense()); + modifyLog.setWeightLimit(oldobj.getWeightLimit()); + modifyLog.setAttachment(oldobj.getAttachment()); modifyLog.setState(4); modifyLog.setChangeUserId(sysuser.getId()); modifyLog.setChangeUserName(sysuser.getName()); @@ -234,7 +233,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService { synctask.addSaveData(modifyLog); return SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser) + && ModifyLogService.me.save(oldobj, saveold, Enums.DataOpType.UPDATE.getId(), sysuser) && ModifyLogService.me.save(modifyLog, null, Enums.DataOpType.SAVE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); @@ -243,6 +242,10 @@ public class TruckWeightLimitSyncService extends BaseSyncService { } }); + if (ret) { + SyncTaskService.me.send(synctask); + } + return ret ? Result.object(oldobj) : Result.failed(false, "恢复失败"); } catch (Exception e) { log.error(e.getMessage(), e); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java index b0dd478..d8347c4 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java @@ -517,6 +517,12 @@ public class SyncTaskService { } if (!sts.isEmpty()) { + for(SyncTask st : sts){ + if(st.getSaveData() == null && st.getUpdateData() == null && st.getDeleteData() == null && st.getIncrementData() == null){ + log.error("错误数据 %s", recvdata.toJSONString()); + } + } + int[] ret = Db.batchSave(sts, sts.size()); if (ret.length != sts.size()) {