diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/modifylog/ModifyLogSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/modifylog/ModifyLogSyncService.java index 369a2d2..aa84c14 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/modifylog/ModifyLogSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/modifylog/ModifyLogSyncService.java @@ -17,6 +17,19 @@ public class ModifyLogSyncService { private static Log log = Log.getLog(ModifyLogSyncService.class); public static final ModifyLogSyncService me = new ModifyLogSyncService(); + public ModifyLog generator(String table, String pks, String editdata, int type, Sysuser sysuser){ + ModifyLog modify = new ModifyLog(); + modify.setId(StrKit.getRandomUUID()); + modify.setTable(table); + modify.setPks(pks); + modify.setEditdata(editdata); + modify.setType(type); + modify.setCreateUserId(sysuser.getId()); + modify.setCreateUserName(sysuser.getName()); + + return modify; + } + /** * 只保存修改的部分 * diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java index f6fe57f..c04c18a 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java @@ -673,28 +673,6 @@ public class TransportSyncService { } } - /** - * 手动创建记录日志 - * - * @param editdata - * @param sysuser - * @return - */ - public boolean saveLog(String editdata, Sysuser sysuser) { - return ModifyLogSyncService.me.save(Transport.tablename, "id", editdata, Enums.DataOpType.SAVE.getId(), sysuser); - } - - /** - * 手动修改记录日志,只记录修改部分 - * - * @param editdata - * @param sysuser - * @return - */ - public boolean editLog(String editdata, Sysuser sysuser) { - return ModifyLogSyncService.me.save(Transport.tablename, "id", editdata, Enums.DataOpType.UPDATE.getId(), sysuser); - } - /** * 手动创建出入场记录 * @@ -760,16 +738,16 @@ public class TransportSyncService { @Override public boolean run() { try { - boolean ret = transport.save() && editLog(logrecord.toJson(), sysuser); + boolean ret = transport.save(); if (!ret) { return false; } + synctask.addSaveData(ModifyLogSyncService.me.generator(Transport.tablename, "id", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser)); synctask.addSaveData(transport); - return SyncTaskService.me.save(synctask) - && ModifyLogSyncService.me.save(transport, null, Enums.DataOpType.SAVE.getId(), sysuser); + return SyncTaskService.me.save(synctask); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -837,9 +815,10 @@ public class TransportSyncService { return false; } + synctask.addSaveData(ModifyLogSyncService.me.generator(Transport.tablename, "id", transport.toJson(), Enums.DataOpType.SAVE.getId(), sysuser)); synctask.addSaveData(transport); - return SyncTaskService.me.save(synctask) && saveLog(transport.toJson(), sysuser); + return SyncTaskService.me.save(synctask); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -916,10 +895,10 @@ public class TransportSyncService { if (!ret) { return false; } - + synctask.addSaveData(ModifyLogSyncService.me.generator(Transport.tablename, "id", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser)); synctask.addUpdateData(transport); - return SyncTaskService.me.save(synctask) && editLog(logrecord.toJson(), sysuser); + return SyncTaskService.me.save(synctask); } catch (Exception e) { log.error(e.getMessage(), e); return false; diff --git a/ssjygl-xsx-local/src/main/resources/dev/config.properties b/ssjygl-xsx-local/src/main/resources/dev/config.properties index bc5991a..2a5c516 100644 --- a/ssjygl-xsx-local/src/main/resources/dev/config.properties +++ b/ssjygl-xsx-local/src/main/resources/dev/config.properties @@ -15,7 +15,7 @@ socketserver.port=21002 socketio.port=12002 #当前部署本地程序的砂站id -current.supermarket_id=6 +current.supermarket_id=1 #落杆后,等待上磅的时间 default_scale_wait_time=5000