diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseModifyLog.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseModifyLog.java index c886d77..c1f82c8 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseModifyLog.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseModifyLog.java @@ -5,7 +5,7 @@ import com.jfinal.plugin.activerecord.IBean; import com.alibaba.fastjson.annotation.JSONField; /** - * Generated by COWR Mon Apr 27 23:46:49 CST 2020 + * Generated by COWR Thu Oct 15 11:48:56 CST 2020 * TableName: modify_log * Remarks: 日志相关 - 配置相关表修改日志记录 * PrimaryKey: id @@ -22,24 +22,24 @@ public abstract class BaseModifyLog> extends BaseMode /** * name: id - * type: BIGINT(19) + * type: CHAR(32) * isNullable: NO * isPrimaryKey: YES * defaultValue: - * @param id + * @param id uuid */ @JSONField(name="id") - public void setId(Long id) { + public void setId(String id) { set("id", id); } /** - * @return id + * @return id uuid */ @JSONField(name="id") - public Long getId() { - return getLong("id"); + public String getId() { + return getStr("id"); } /** diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java index 5a72172..f5df810 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/invoice/log/InvoiceLogService.java @@ -156,7 +156,7 @@ public class InvoiceLogService extends BaseService { if (invoice_type != null) { fromsql += " and t.invoice_type = ? \n"; - paraList.add(state); + paraList.add(invoice_type); } String totalRowSql = "select count(*) " + fromsql; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java index cb1fa5b..d8f25f8 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogController.java @@ -3,6 +3,7 @@ package com.cowr.ssjygl.modifylog; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.ModifyLog; +import com.cowr.ssjygl.actioncmdlog.ActionCmdLogService; import com.jfinal.aop.Before; import com.jfinal.core.Controller; @@ -37,4 +38,12 @@ public class ModifyLogController extends Controller { public void list(){ renderJson(Result.object(ModifyLogService.me.list())); } + + public void findManualWeight() { + PageParam pp = getBean(PageParam.class, "", true); + String create_user_name = get("create_user_name"); + String stm = get("stm"); + String etm = get("etm"); + renderJson(Result.object(ModifyLogService.me.findManualWeight(pp, create_user_name, stm, etm))); + } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogService.java index 1738312..210648c 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/modifylog/ModifyLogService.java @@ -1,14 +1,19 @@ package com.cowr.ssjygl.modifylog; +import com.alibaba.fastjson.JSONObject; import com.cowr.common.Const; import com.cowr.common.base.BaseModel; import com.cowr.common.base.BaseService; +import com.cowr.common.enums.Enums; import com.cowr.common.utils.StrUtil; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; +import com.cowr.model.ActionCmdLog; import com.cowr.model.ModifyLog; import com.cowr.model.Sysuser; +import com.cowr.model.Transport; import com.jfinal.kit.StrKit; +import com.jfinal.log.Log; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; @@ -26,10 +31,12 @@ import java.util.List; * PrimaryKey: id */ public class ModifyLogService { - public static final ModifyLogService me = new ModifyLogService(); + private static Log log = Log.getLog(ModifyLogService.class); + public static final ModifyLogService me = new ModifyLogService(); /** * 只保存修改的部分 + * * @param table * @param pks * @param editdata @@ -37,8 +44,9 @@ public class ModifyLogService { * @param sysuser * @return */ - public boolean save(String table, String pks, String editdata, int type, Sysuser sysuser){ + public boolean save(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); @@ -61,6 +69,7 @@ public class ModifyLogService { public boolean save(BaseModel newobj, BaseModel oldobj, int type, Sysuser sysuser) { String[] pkeys = newobj.getPKey(); ModifyLog modify = new ModifyLog(); + modify.setId(StrKit.getRandomUUID()); modify.setTable(newobj.getTablename()); modify.setPks(StrUtil.join(Arrays.asList(pkeys), ",")); modify.setType(type); @@ -74,31 +83,6 @@ public class ModifyLogService { return modify.save(); } - public boolean batchSave(List newlist, List oldlist, int type, Sysuser sysuser) { - List mls = new ArrayList<>(); - for (int i = 0, len = newlist.size(); i < len; i++) { - BaseModel newobj = (BaseModel) newlist.get(i); - String[] pkeys = newobj.getPKey(); - ModifyLog modify = new ModifyLog(); - modify.setTable(newobj.getTablename()); - modify.setPks(StrUtil.join(Arrays.asList(pkeys), ",")); - modify.setType(type); - modify.setNewdata(newobj.toJson()); - if (oldlist != null) { - BaseModel oldobj = oldlist.get(i); - if (oldobj != null) { - modify.setOlddata(oldobj.toJson()); - } - } - modify.setCreateUserId(sysuser.getId()); - modify.setCreateUserName(sysuser.getName()); - - mls.add(modify); - } - - return Db.batchSave(mls, mls.size()).length == mls.size(); - } - /** * 按主键查单个对象 * @@ -134,4 +118,116 @@ public class ModifyLogService { public List list() { return ModifyLog.dao.find("select * from modify_log"); } + + public Page findManualWeight(PageParam pp, String create_user_name, String stm, String etm) { + String selectsql = "select * "; + String fromsql = " from modify_log t where t.`table` = 'transport'\n" + + " and t.editdata -> '$.modify_content' = 'manualWeight'"; + List paraList = new ArrayList<>(); + + if (StrKit.notBlank(create_user_name)) { + fromsql += " and t.create_user_name like ? \n"; + paraList.add("%" + create_user_name + "%"); + } + + if (StrKit.notBlank(stm)) { + fromsql += " and t.create_time >= ? \n"; + paraList.add(stm); + } + + if (StrKit.notBlank(etm)) { + fromsql += " and t.create_time <= ? \n"; + paraList.add(etm); + } + + String totalRowSql = "select count(*) " + fromsql; + String findSql = selectsql + fromsql; + + // 前端传了排序字段，并且排序字段存在相关表中 + if (StrKit.notBlank(pp.getSort_field()) && ActionCmdLog.dao.hasColunm(pp.getSort_field())) { + findSql += " order by t." + pp.getSort_field() + " is null, t." + pp.getSort_field(); + + if (Const.ORDER_BY_ASC.equals(pp.getSort_order())) { + findSql += " " + Const.ORDER_BY_ASC; + } else { + findSql += " " + Const.ORDER_BY_DESC; + } + } else { + findSql += " order by t.create_time desc"; + } + + Page page = Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); + List list = page.getList(); + List sqlparams = new ArrayList<>(); + List params = new ArrayList<>(); + + for (Record record : list) { + try { + String content = record.getStr("editdata"); + + if (content == null) { + continue; + } + + JSONObject obj = JSONObject.parseObject(content); + String modify_type = obj.getString("modify_type"); + + if (modify_type == null) { + record.set("content", content); + } else { + if ("manualCreate".equals(modify_type)) { + String first_weight = String.format("%.2f", obj.getBigDecimal("first_weight")); + String second_weight = String.format("%.2f", obj.getBigDecimal("second_weight")); + + record.set("content", "手动创建进出场记录，皮重 " + first_weight + "，毛重 " + second_weight); + sqlparams.add("?"); + params.add(obj.get("id")); + } else if (modify_type.contains("manualWeight_" + Enums.CtrlFlowEnum.R.name())) { + String first_weight = String.format("%.2f", obj.getBigDecimal("first_weight")); + String first_weight_old = String.format("%.2f", obj.getBigDecimal("first_weight_old")); + record.set("content", "手动将入场重量由 " + first_weight_old + " 改为：" + first_weight); + sqlparams.add("?"); + params.add(obj.get("id")); + } else if (modify_type.contains("manualWeight_" + Enums.CtrlFlowEnum.C.name())) { + String second_weight = String.format("%.2f", obj.getBigDecimal("second_weight")); + String second_weight_old = String.format("%.2f", obj.getBigDecimal("second_weight_old")); + record.set("content", "手动将出场重量由 " + second_weight_old + " 改为：" + second_weight); + sqlparams.add("?"); + params.add(obj.get("id")); + } + } + } catch (Exception e) { + log.error(e.getMessage(), e); + } + } + + List transports = Transport.dao.find("select * from transport t where t.id in(" + StrKit.join(sqlparams, ",") + ")", params.toArray()); + + for (Record record : list) { + try { + String content = record.getStr("editdata"); + + if (content == null) { + continue; + } + + JSONObject obj = JSONObject.parseObject(content); + String id = obj.getString("id"); + + for (Transport transport : transports) { + if (transport.getId().equals(id)) { + record.set("truck_license", transport.getTruckLicense()); + record.set("order_sn", transport.getOrderSn()); + record.set("state", transport.getState()); + } + } + + record.remove("editdata"); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + } + + return page; + } } diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseSyncService.java index c94465d..092929a 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/authlicense/AuthLicenseSyncService.java @@ -10,7 +10,7 @@ import com.cowr.model.AuthLicense; import com.cowr.model.Blacklist; import com.cowr.model.SyncTask; import com.cowr.model.Sysuser; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.local.ssjygl.modifylog.ModifyLogSyncService; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; import com.jfinal.plugin.activerecord.Db; @@ -195,7 +195,7 @@ public class AuthLicenseSyncService extends BaseService { int[] ret = Db.batch("delete from auth_license where truck_license = ?", parms, arr.length); return ret.length == arr.length && SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(AuthLicense.tablename, "truck_license", logrecord.toJson(), Enums.DataOpType.DELETE.getId(), sysuser); + && ModifyLogSyncService.me.save(AuthLicense.tablename, "truck_license", logrecord.toJson(), Enums.DataOpType.DELETE.getId(), sysuser); } }); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/base/BaseSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/base/BaseSyncService.java index a6bcdf3..9d1acd4 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/base/BaseSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/base/BaseSyncService.java @@ -8,7 +8,7 @@ import com.cowr.common.view.Result; import com.cowr.local.ssjygl.synctask.SyncTaskService; import com.cowr.model.SyncTask; import com.cowr.model.Sysuser; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.local.ssjygl.modifylog.ModifyLogSyncService; import com.jfinal.log.Log; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.IAtom; @@ -45,7 +45,7 @@ public class BaseSyncService extends BaseService { try { return model.save() && SyncTaskService.me.save(new SyncTask().addSaveData(model)) - && ModifyLogService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser); + && ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -88,7 +88,7 @@ public class BaseSyncService extends BaseService { try { return model.delete() && SyncTaskService.me.save(new SyncTask().addDeleteData(model)) - && ModifyLogService.me.save(model, (BaseModel) model.findByPk(), Enums.DataOpType.DELETE.getId(), sysuser); + && ModifyLogSyncService.me.save(model, (BaseModel) model.findByPk(), Enums.DataOpType.DELETE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -132,7 +132,7 @@ public class BaseSyncService extends BaseService { try { return oldobj.update() && SyncTaskService.me.save(new SyncTask().addUpdateData(oldobj)) - && ModifyLogService.me.save(model, saveold, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(model, saveold, Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistSyncService.java index 1058e72..92ce56e 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/blacklist/BlacklistSyncService.java @@ -5,7 +5,7 @@ import com.cowr.common.view.Result; import com.cowr.local.ssjygl.base.BaseSyncService; import com.cowr.local.ssjygl.synctask.SyncTaskService; import com.cowr.model.*; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.local.ssjygl.modifylog.ModifyLogSyncService; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; import com.jfinal.plugin.activerecord.Db; @@ -56,13 +56,13 @@ public class BlacklistSyncService extends BaseSyncService { synctask.addUpdateData(truck); ret = truck.update() - && ModifyLogService.me.save(truck, oldtruck, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(truck, oldtruck, Enums.DataOpType.UPDATE.getId(), sysuser); } } return ret && SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser); + && ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -122,13 +122,13 @@ public class BlacklistSyncService extends BaseSyncService { synctask.addUpdateData(truck); ret = truck.update() - && ModifyLogService.me.save(truck, oldtruck, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(truck, oldtruck, Enums.DataOpType.UPDATE.getId(), sysuser); } } return ret && SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, null, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(model, null, Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java index cb0dd8e..17f23f6 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java @@ -52,6 +52,7 @@ import com.cowr.ssjygl.CacheData; import com.cowr.ssjygl.cctv.CctvController; import com.cowr.local.ssjygl.prepay.PrepayController; import com.cowr.local.ssjygl.overall.OverallController; +import com.cowr.ssjygl.modifylog.ModifyLogController; import com.cowr.ssjygl.stat.purchase.OrderPurchaseStatController; import com.cowr.local.ssjygl.stat.sale.OrderStatController; import com.cowr.ssjygl.stat.transfer.OrderTransferStatController; @@ -90,7 +91,7 @@ public class Config extends JFinalConfig { public static DeviceThread deviceThread = new DeviceThread(); public static SocketIOService socketio = null; private static boolean client_run = true; - public static final String CLINET_VERSION = "20201014"; + public static final String CLINET_VERSION = "20201015"; public static String getRootPath() { return PathKit.getWebRootPath() @@ -227,6 +228,7 @@ public class Config extends JFinalConfig { // -- 日志 me.add("/log/sms", SmsLogController.class); me.add("/log/actioncmd", ActionCmdLogController.class); + me.add("/log/modify", ModifyLogController.class); } @Override 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 new file mode 100644 index 0000000..92cce10 --- /dev/null +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/modifylog/ModifyLogSyncService.java @@ -0,0 +1,88 @@ +package com.cowr.local.ssjygl.modifylog; + +import com.cowr.common.base.BaseModel; +import com.cowr.common.utils.StrUtil; +import com.cowr.local.ssjygl.synctask.SyncTaskService; +import com.cowr.model.ModifyLog; +import com.cowr.model.SyncTask; +import com.cowr.model.Sysuser; +import com.jfinal.kit.StrKit; +import com.jfinal.log.Log; +import com.jfinal.plugin.activerecord.Db; +import com.jfinal.plugin.activerecord.IAtom; + +import java.util.Arrays; + +public class ModifyLogSyncService { + private static Log log = Log.getLog(ModifyLogSyncService.class); + public static final ModifyLogSyncService me = new ModifyLogSyncService(); + + /** + * 只保存修改的部分 + * + * @param table + * @param pks + * @param editdata + * @param type + * @param sysuser + * @return + */ + public boolean save(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 Db.tx(new IAtom() { + @Override + public boolean run() { + try { + return modify.save() && SyncTaskService.me.save(new SyncTask().addSaveData(modify)); + } catch (Exception e) { + log.error(e.getMessage(), e); + return false; + } + } + }); + } + + /** + * 保存配置修改日志 + * + * @param newobj + * @param oldobj + * @param type + * @param sysuser + * @return + */ + public boolean save(BaseModel newobj, BaseModel oldobj, int type, Sysuser sysuser) { + String[] pkeys = newobj.getPKey(); + ModifyLog modify = new ModifyLog(); + modify.setId(StrKit.getRandomUUID()); + modify.setTable(newobj.getTablename()); + modify.setPks(StrUtil.join(Arrays.asList(pkeys), ",")); + modify.setType(type); + modify.setNewdata(newobj.toJson()); + if (oldobj != null) { + modify.setOlddata(oldobj.toJson()); + } + modify.setCreateUserId(sysuser.getId()); + modify.setCreateUserName(sysuser.getName()); + + return Db.tx(new IAtom() { + @Override + public boolean run() { + try { + return modify.save() && SyncTaskService.me.save(new SyncTask().addSaveData(modify)); + } catch (Exception e) { + log.error(e.getMessage(), e); + return false; + } + } + }); + } +} diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseSyncService.java index 3ac6c24..876ac4e 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/orderpurchase/OrderPurchaseSyncService.java @@ -9,7 +9,7 @@ import com.cowr.local.ssjygl.order.orderseq.OrderSeqService; import com.cowr.local.ssjygl.synctask.SyncTaskService; import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.*; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.local.ssjygl.modifylog.ModifyLogSyncService; import com.cowr.ssjygl.supermarket.sandfarmdistance.SupermarketSandfarmDistanceService; import com.cowr.ssjygl.transprice.TransPriceService; import com.jfinal.log.Log; @@ -228,7 +228,7 @@ public class OrderPurchaseSyncService { return order.update() && stock.update() && SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java index 241b6c7..e48c224 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java @@ -11,7 +11,7 @@ import com.cowr.ssjygl.supermarket.product.SupermarketProductService; import com.cowr.local.ssjygl.synctask.SyncTaskService; import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.*; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.local.ssjygl.modifylog.ModifyLogSyncService; import com.cowr.ssjygl.prepay.prepaycustomer.PrepayCustomerService; import com.cowr.ssjygl.transprice.TransPriceService; import com.jfinal.kit.StrKit; @@ -561,7 +561,7 @@ public class OrderSaleSyncService { synctask.addUpdateData(order); boolean ret = order.update() - && ModifyLogService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); if (!ret) { return false; diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java index f89b6e9..035fe71 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java @@ -17,7 +17,7 @@ import com.cowr.ssjygl.supermarket.product.SupermarketProductService; import com.cowr.local.ssjygl.synctask.SyncTaskService; import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.*; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.local.ssjygl.modifylog.ModifyLogSyncService; import com.cowr.ssjygl.prepay.prepaycustomer.PrepayCustomerService; import com.cowr.ssjygl.transprice.TransPriceService; import com.jfinal.kit.StrKit; @@ -938,7 +938,7 @@ public class OrderTempSyncService { synctask.addUpdateData(stock); return ret && SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -1025,7 +1025,7 @@ public class OrderTempSyncService { synctask.addUpdateData(receive); return ret && SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java index b4fd915..6a47240 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertransfer/OrderTransferSyncService.java @@ -9,7 +9,7 @@ import com.cowr.local.ssjygl.order.orderseq.OrderSeqService; import com.cowr.local.ssjygl.synctask.SyncTaskService; import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.*; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.local.ssjygl.modifylog.ModifyLogSyncService; import com.cowr.ssjygl.supermarket.sandfarmdistance.SupermarketSandfarmDistanceService; import com.cowr.ssjygl.transprice.TransPriceService; import com.jfinal.log.Log; @@ -241,7 +241,7 @@ public class OrderTransferSyncService { return order.update() && stock.update() && SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashSyncService.java index 7aed7b8..5f59e4f 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertrash/OrderTrashSyncService.java @@ -9,7 +9,7 @@ import com.cowr.local.ssjygl.order.orderseq.OrderSeqService; import com.cowr.local.ssjygl.synctask.SyncTaskService; import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.*; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.local.ssjygl.modifylog.ModifyLogSyncService; import com.cowr.ssjygl.transprice.TransPriceService; import com.jfinal.log.Log; import com.jfinal.plugin.activerecord.Db; @@ -217,7 +217,7 @@ public class OrderTrashSyncService { boolean ret = order.update() && stock.update() && SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); return ret; } catch (Exception e) { diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java index 338e440..4aa5a15 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java @@ -7,7 +7,7 @@ import com.cowr.common.view.Result; import com.cowr.local.ssjygl.base.BaseSyncService; import com.cowr.local.ssjygl.synctask.SyncTaskService; import com.cowr.model.*; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.local.ssjygl.modifylog.ModifyLogSyncService; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; import com.jfinal.plugin.activerecord.Db; diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java index 92cd0e9..3e6cbeb 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java @@ -12,7 +12,7 @@ import com.cowr.local.ssjygl.main.CliCacheData; import com.cowr.local.ssjygl.main.Config; import com.cowr.local.ssjygl.synctask.SyncTaskService; import com.cowr.model.*; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.local.ssjygl.modifylog.ModifyLogSyncService; import com.jfinal.kit.HashKit; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; @@ -377,7 +377,7 @@ public class SysuserSyncService extends BaseService { } return SyncTaskService.me.save(new SyncTask().addUpdateData(sysuser)) - && ModifyLogService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser); + && ModifyLogSyncService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser); } }); 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 d099664..5e30a85 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 @@ -16,7 +16,7 @@ import com.cowr.local.ssjygl.system.sysuser.SysuserSyncService; import com.cowr.model.*; import com.cowr.ssjygl.CacheData; import com.cowr.ssjygl.blacklist.BlacklistService; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.local.ssjygl.modifylog.ModifyLogSyncService; import com.cowr.ssjygl.order.OrderService; import com.cowr.ssjygl.order.ordercluster.truck.OrderclusterTruckService; import com.cowr.ssjygl.transport.TransportService; @@ -69,7 +69,7 @@ public class TransportSyncService { try { return authlic.save() && SyncTaskService.me.save(new SyncTask().addSaveData(authlic)) - && ModifyLogService.me.save(authlic, null, Enums.DataOpType.SAVE.getId(), sysuser); + && ModifyLogSyncService.me.save(authlic, null, Enums.DataOpType.SAVE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -638,7 +638,7 @@ public class TransportSyncService { * @return */ public boolean saveLog(String editdata, Sysuser sysuser) { - return ModifyLogService.me.save(Transport.tablename, "id", editdata, Enums.DataOpType.SAVE.getId(), sysuser); + return ModifyLogSyncService.me.save(Transport.tablename, "id", editdata, Enums.DataOpType.SAVE.getId(), sysuser); } /** @@ -649,7 +649,7 @@ public class TransportSyncService { * @return */ public boolean editLog(String editdata, Sysuser sysuser) { - return ModifyLogService.me.save(Transport.tablename, "id", editdata, Enums.DataOpType.UPDATE.getId(), sysuser); + return ModifyLogSyncService.me.save(Transport.tablename, "id", editdata, Enums.DataOpType.UPDATE.getId(), sysuser); } /** @@ -709,6 +709,7 @@ public class TransportSyncService { Record logrecord = new Record(); logrecord.set("id", transport.getId()); logrecord.set("modify_content", "manualWeight"); // 创建入场记录，用 Enums.DataOpType.UPDATE 记录 + logrecord.set("modify_type", "manualCreate"); logrecord.set("first_weight", transport.getFirstWeight()); logrecord.set("second_weight", transport.getSecondWeight()); @@ -725,7 +726,7 @@ public class TransportSyncService { synctask.addSaveData(transport); return SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(transport, null, Enums.DataOpType.SAVE.getId(), sysuser); + && ModifyLogSyncService.me.save(transport, null, Enums.DataOpType.SAVE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -838,14 +839,20 @@ public class TransportSyncService { Record logrecord = new Record(); logrecord.set("id", transport_id); logrecord.set("modify_content", "manualWeight"); + logrecord.set("modify_type", "manualWeight_" + which); if (which.startsWith(Enums.CtrlFlowEnum.R.name())) { // 入场重量 - transport.setFirstWeight(new BigDecimal(weight)); - transport.setFirstWeightWhich(which); - + logrecord.set("first_weight_old", transport.getFirstWeight()); logrecord.set("first_weight", weight); logrecord.set("first_weight_which", which); + + transport.setFirstWeight(new BigDecimal(weight)); + transport.setFirstWeightWhich(which); } else if (which.startsWith(Enums.CtrlFlowEnum.C.name())) { // 出场重量 + logrecord.set("second_weight_old", transport.getSecondWeight()); + logrecord.set("second_weight", weight); + logrecord.set("second_weight_which", which); + transport.setSecondWeight(new BigDecimal(weight)); transport.setSecondWeightWhich(which); @@ -853,9 +860,6 @@ public class TransportSyncService { transport.setOutTime(new Date()); transport.setOutWhich(which); } - - logrecord.set("second_weight", weight); - logrecord.set("second_weight_which", which); } boolean ret = Db.tx(new IAtom() { @@ -902,7 +906,7 @@ public class TransportSyncService { try { boolean ret = transport.update() && SyncTaskService.me.save(new SyncTask().addUpdateData(transport)) - && ModifyLogService.me.save(transport.tablename, "transport_id", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(transport.tablename, "transport_id", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); if (ret) { if (StrKit.notBlank(transport.getOrderSn())) { BaseModel snorder = OrderService.me.getOrderBySn(transport.getOrderSn()); @@ -972,7 +976,7 @@ public class TransportSyncService { // public boolean run() { // try { // return BocommService.me.closeTran(bocomm) -// && ModifyLogService.me.save(bocomm.tablename, "id", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); +// && ModifyLogSyncService.me.save(bocomm.tablename, "id", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); // } catch (Exception e) { // log.error(e.getMessage(), e); // return false; diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/base/BaseSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/base/BaseSyncService.java index 9c4b89e..aa0ced9 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/base/BaseSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/base/BaseSyncService.java @@ -8,7 +8,7 @@ import com.cowr.common.view.Result; import com.cowr.model.SyncTask; import com.cowr.model.Sysuser; import com.cowr.service.ssjygl.synctask.SyncTaskService; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.service.ssjygl.modifylog.ModifyLogSyncService; import com.jfinal.log.Log; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.IAtom; @@ -45,7 +45,7 @@ public class BaseSyncService extends BaseService { try { return model.save() && SyncTaskService.me.save(new SyncTask().addSaveData(model)) - && ModifyLogService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser); + && ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -88,7 +88,7 @@ public class BaseSyncService extends BaseService { try { return model.delete() && SyncTaskService.me.save(new SyncTask().addDeleteData(model)) - && ModifyLogService.me.save(model, (BaseModel) model.findByPk(), Enums.DataOpType.DELETE.getId(), sysuser); + && ModifyLogSyncService.me.save(model, (BaseModel) model.findByPk(), Enums.DataOpType.DELETE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -131,7 +131,7 @@ public class BaseSyncService extends BaseService { try { return oldobj.update() && SyncTaskService.me.save(new SyncTask().addUpdateData(oldobj)) - && ModifyLogService.me.save(model, saveold, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(model, saveold, Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistSyncService.java index 13de340..fcd81cf 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistSyncService.java @@ -5,7 +5,7 @@ import com.cowr.common.view.Result; import com.cowr.model.*; import com.cowr.service.ssjygl.base.BaseSyncService; import com.cowr.service.ssjygl.synctask.SyncTaskService; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.service.ssjygl.modifylog.ModifyLogSyncService; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; import com.jfinal.plugin.activerecord.Db; @@ -55,13 +55,13 @@ public class BlacklistSyncService extends BaseSyncService { synctask.addUpdateData(truck); ret = truck.update() - && ModifyLogService.me.save(truck, oldtruck, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(truck, oldtruck, Enums.DataOpType.UPDATE.getId(), sysuser); } } return ret && SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser); + && ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -121,13 +121,13 @@ public class BlacklistSyncService extends BaseSyncService { synctask.addUpdateData(truck); ret = truck.update() - && ModifyLogService.me.save(truck, oldtruck, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(truck, oldtruck, Enums.DataOpType.UPDATE.getId(), sysuser); } } return ret && SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, null, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(model, null, Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerSyncService.java index 4d4a354..f465274 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerSyncService.java @@ -9,7 +9,7 @@ import com.cowr.model.SyncTask; import com.cowr.model.Sysuser; import com.cowr.service.ssjygl.base.BaseSyncService; import com.cowr.service.ssjygl.synctask.SyncTaskService; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.service.ssjygl.modifylog.ModifyLogSyncService; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; import com.jfinal.plugin.activerecord.Db; @@ -56,7 +56,7 @@ public class CustomerSyncService extends BaseSyncService { synctask.addSaveData(receiver); ret = receiver.save() - && ModifyLogService.me.save(receiver, null, Enums.DataOpType.SAVE.getId(), sysuser); + && ModifyLogSyncService.me.save(receiver, null, Enums.DataOpType.SAVE.getId(), sysuser); if (!ret) { return false; @@ -66,7 +66,7 @@ public class CustomerSyncService extends BaseSyncService { synctask.addSaveData(model); return SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser); + && ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -170,7 +170,7 @@ public class CustomerSyncService extends BaseSyncService { synctask.addSaveData(receiver); ret = receiver.save() - && ModifyLogService.me.save(receiver, null, Enums.DataOpType.SAVE.getId(), sysuser); + && ModifyLogSyncService.me.save(receiver, null, Enums.DataOpType.SAVE.getId(), sysuser); } else { CustomerReceiver oldreceiver = receiver.clone(); receiver.setName(receiver_name); @@ -179,7 +179,7 @@ public class CustomerSyncService extends BaseSyncService { synctask.addUpdateData(receiver); ret = receiver.update() - && ModifyLogService.me.save(receiver, oldreceiver, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(receiver, oldreceiver, Enums.DataOpType.UPDATE.getId(), sysuser); } if (!ret) { @@ -188,7 +188,7 @@ public class CustomerSyncService extends BaseSyncService { } return SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(oldobj, saveold, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(oldobj, saveold, Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterService.java index 65cc25f..454bb51 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterService.java @@ -10,7 +10,7 @@ import com.cowr.common.view.Result; import com.cowr.model.*; import com.cowr.service.ssjygl.synctask.SyncTaskService; import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.service.ssjygl.modifylog.ModifyLogSyncService; import com.jfinal.i18n.Res; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; @@ -111,7 +111,7 @@ public class CustomerRegisterService extends BaseService { @Override public boolean run() { try { - return register.update() && ModifyLogService.me.save(register, old, Enums.DataOpType.UPDATE.getId(), user); + return register.update() && ModifyLogSyncService.me.save(register, old, Enums.DataOpType.UPDATE.getId(), user); } catch (Exception e) { log.error(e.getMessage(), e); } @@ -196,7 +196,7 @@ public class CustomerRegisterService extends BaseService { synctask.addSaveData(customer); synctask.addSaveData(receiver); - return SyncTaskService.me.save(synctask) && ModifyLogService.me.save(register, old, Enums.DataOpType.UPDATE.getId(), user); + return SyncTaskService.me.save(synctask) && ModifyLogSyncService.me.save(register, old, Enums.DataOpType.UPDATE.getId(), user); } catch (Exception e) { log.error(e.getMessage(), e); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogSyncService.java index 7297446..e753f95 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogSyncService.java @@ -9,7 +9,7 @@ import com.cowr.model.*; import com.cowr.service.ssjygl.base.BaseSyncService; import com.cowr.service.ssjygl.synctask.SyncTaskService; import com.cowr.ssjygl.invoice.receive.InvoiceReceiveService; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.service.ssjygl.modifylog.ModifyLogSyncService; import com.cowr.ssjygl.order.OrderService; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; @@ -200,7 +200,7 @@ public class InvoiceLogSyncService extends BaseSyncService { synctask.addUpdateData(receive); return SyncTaskService.me.save(synctask, supermarket_id) - && ModifyLogService.me.save(finalInvoiceLog, null, Enums.DataOpType.SAVE.getId(), sysuser); + && ModifyLogSyncService.me.save(finalInvoiceLog, null, Enums.DataOpType.SAVE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -295,7 +295,7 @@ public class InvoiceLogSyncService extends BaseSyncService { synctask.addUpdateData(invoiceLog); return SyncTaskService.me.save(synctask, order.getInt("supermarket_id")) - && ModifyLogService.me.save(invoiceLog, old, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(invoiceLog, old, Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); } @@ -430,7 +430,7 @@ public class InvoiceLogSyncService extends BaseSyncService { } } - return ModifyLogService.me.save(InvoiceLog.tablename, "id", logrecord.toJson(), Enums.DataOpType.SAVE.getId(), sysuser); + return ModifyLogSyncService.me.save(InvoiceLog.tablename, "id", logrecord.toJson(), Enums.DataOpType.SAVE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveSyncService.java index 087e52d..a86486e 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveSyncService.java @@ -9,7 +9,7 @@ import com.cowr.model.Sysuser; import com.cowr.service.ssjygl.base.BaseSyncService; import com.cowr.service.ssjygl.main.SvrCacheData; import com.cowr.service.ssjygl.synctask.SyncTaskService; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.service.ssjygl.modifylog.ModifyLogSyncService; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; import com.jfinal.plugin.activerecord.Db; @@ -67,7 +67,7 @@ public class InvoiceReceiveSyncService extends BaseSyncService { try { return receive.save() && SyncTaskService.me.save(new SyncTask().addSaveData(receive), receive.getSupermarketId()) // 下发到指定的砂站 - && ModifyLogService.me.save(receive, null, Enums.DataOpType.SAVE.getId(), user); + && ModifyLogSyncService.me.save(receive, null, Enums.DataOpType.SAVE.getId(), user); } catch (Exception e) { log.error(e.getMessage(), e); return false; diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java index e074cb9..891af02 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java @@ -46,6 +46,7 @@ import com.cowr.ssjygl.actioncmdlog.ActionCmdLogController; import com.cowr.ssjygl.cctv.CctvController; import com.cowr.service.ssjygl.prepay.PrepayController; import com.cowr.service.ssjygl.overall.OverallController; +import com.cowr.ssjygl.modifylog.ModifyLogController; import com.cowr.ssjygl.stat.purchase.OrderPurchaseStatController; import com.cowr.service.ssjygl.stat.sale.OrderStatController; import com.cowr.ssjygl.stat.transfer.OrderTransferStatController; @@ -194,6 +195,7 @@ public class Config extends JFinalConfig { // -- 日志 me.add("/log/sms", SmsLogController.class); me.add("/log/actioncmd", ActionCmdLogController.class); + me.add("/log/modify", ModifyLogController.class); } @Override diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/modifylog/ModifyLogSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/modifylog/ModifyLogSyncService.java new file mode 100644 index 0000000..31c8723 --- /dev/null +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/modifylog/ModifyLogSyncService.java @@ -0,0 +1,88 @@ +package com.cowr.service.ssjygl.modifylog; + +import com.cowr.common.base.BaseModel; +import com.cowr.common.utils.StrUtil; +import com.cowr.model.ModifyLog; +import com.cowr.model.SyncTask; +import com.cowr.model.Sysuser; +import com.cowr.service.ssjygl.synctask.SyncTaskService; +import com.jfinal.kit.StrKit; +import com.jfinal.log.Log; +import com.jfinal.plugin.activerecord.Db; +import com.jfinal.plugin.activerecord.IAtom; + +import java.util.Arrays; + +public class ModifyLogSyncService { + private static Log log = Log.getLog(ModifyLogSyncService.class); + public static final ModifyLogSyncService me = new ModifyLogSyncService(); + + /** + * 只保存修改的部分 + * + * @param table + * @param pks + * @param editdata + * @param type + * @param sysuser + * @return + */ + public boolean save(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 Db.tx(new IAtom() { + @Override + public boolean run() { + try { + return modify.save() && SyncTaskService.me.save(new SyncTask().addSaveData(modify)); + } catch (Exception e) { + log.error(e.getMessage(), e); + return false; + } + } + }); + } + + /** + * 保存配置修改日志 + * + * @param newobj + * @param oldobj + * @param type + * @param sysuser + * @return + */ + public boolean save(BaseModel newobj, BaseModel oldobj, int type, Sysuser sysuser) { + String[] pkeys = newobj.getPKey(); + ModifyLog modify = new ModifyLog(); + modify.setId(StrKit.getRandomUUID()); + modify.setTable(newobj.getTablename()); + modify.setPks(StrUtil.join(Arrays.asList(pkeys), ",")); + modify.setType(type); + modify.setNewdata(newobj.toJson()); + if (oldobj != null) { + modify.setOlddata(oldobj.toJson()); + } + modify.setCreateUserId(sysuser.getId()); + modify.setCreateUserName(sysuser.getName()); + + return Db.tx(new IAtom() { + @Override + public boolean run() { + try { + return modify.save() && SyncTaskService.me.save(new SyncTask().addSaveData(modify)); + } catch (Exception e) { + log.error(e.getMessage(), e); + return false; + } + } + }); + } +} diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java index 6fb25af..c5389a9 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java @@ -12,7 +12,7 @@ import com.cowr.service.ssjygl.base.BaseSyncService; import com.cowr.service.ssjygl.main.SvrCacheData; import com.cowr.service.ssjygl.smslog.SmsService; import com.cowr.service.ssjygl.synctask.SyncTaskService; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.service.ssjygl.modifylog.ModifyLogSyncService; import com.cowr.ssjygl.order.ordercluster.OrderclusterService; import com.cowr.ssjygl.prepay.prepaycustomer.PrepayCustomerService; import com.cowr.ssjygl.supermarket.SupermarketService; @@ -471,7 +471,7 @@ public class OrderclusterSyncService extends BaseSyncService { try { return model.save() && SyncTaskService.me.save(new SyncTask().addSaveData(model), model.getSupermarketId()) - && ModifyLogService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser); + && ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); @@ -581,7 +581,7 @@ public class OrderclusterSyncService extends BaseSyncService { try { return oldobj.update() && SyncTaskService.me.save(new SyncTask().addUpdateData(oldobj), oldobj.getSupermarketId()) - && ModifyLogService.me.save(model, null, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(model, null, Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); @@ -618,7 +618,7 @@ public class OrderclusterSyncService extends BaseSyncService { try { return oldobj.update() && SyncTaskService.me.save(new SyncTask().addUpdateData(oldobj), oldobj.getSupermarketId()) - && ModifyLogService.me.save(oldobj, null, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(oldobj, null, Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); @@ -656,7 +656,7 @@ public class OrderclusterSyncService extends BaseSyncService { try { return oldobj.update() && SyncTaskService.me.save(new SyncTask().addUpdateData(oldobj), oldobj.getSupermarketId()) - && ModifyLogService.me.save(oldobj, null, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(oldobj, null, Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java index 23fdfde..3eb5131 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java @@ -7,7 +7,7 @@ import com.cowr.common.view.Result; import com.cowr.model.*; import com.cowr.service.ssjygl.base.BaseSyncService; import com.cowr.service.ssjygl.synctask.SyncTaskService; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.service.ssjygl.modifylog.ModifyLogSyncService; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; import com.jfinal.plugin.activerecord.Db; @@ -165,7 +165,7 @@ public class OrderclusterTruckSyncService extends BaseSyncService { } return SyncTaskService.me.save(synctask, ordercluster.getSupermarketId()) - && ModifyLogService.me.save(OrderclusterTruck.tablename, "id", logrecord.toJson(), Enums.DataOpType.SAVE.getId(), sysuser); + && ModifyLogSyncService.me.save(OrderclusterTruck.tablename, "id", logrecord.toJson(), Enums.DataOpType.SAVE.getId(), sysuser); } }); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempSyncService.java index 1568eca..26996de 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempSyncService.java @@ -7,7 +7,7 @@ import com.cowr.common.view.Result; import com.cowr.model.*; import com.cowr.service.ssjygl.synctask.SyncTaskService; import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.service.ssjygl.modifylog.ModifyLogSyncService; import com.cowr.ssjygl.prepay.prepaycustomer.PrepayCustomerService; import com.jfinal.log.Log; import com.jfinal.plugin.activerecord.Db; @@ -90,6 +90,7 @@ public class OrderTempSyncService { // } // 已开具发票 + // TODO: 如果是专票，还能不能取消？ if (order.getInvoiceCode() != null) { InvoiceLog invoiceLog = InvoiceLog.dao.findFirst( "select * from invoice_log t where invoice_number = ? and code = ? limit 1 ", @@ -163,7 +164,7 @@ public class OrderTempSyncService { synctask.addUpdateData(stock); return ret && SyncTaskService.me.save(synctask, order.getSupermarketId()) - && ModifyLogService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailSyncService.java index e966bd4..b35b370 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailSyncService.java @@ -7,7 +7,7 @@ import com.cowr.model.*; import com.cowr.service.ssjygl.base.BaseSyncService; import com.cowr.service.ssjygl.synctask.SyncTaskService; import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.service.ssjygl.modifylog.ModifyLogSyncService; import com.cowr.ssjygl.prepay.prepaycustomer.PrepayCustomerService; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; @@ -63,7 +63,7 @@ public class PrepayDetailSyncService extends BaseSyncService { synctask.addSaveData(his); return SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, null, Enums.DataOpType.SAVE.getId(), user); + && ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), user); } }); @@ -191,7 +191,7 @@ public class PrepayDetailSyncService extends BaseSyncService { synctask.addSaveData(his); return SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, oldmodel, Enums.DataOpType.UPDATE.getId(), user); + && ModifyLogSyncService.me.save(model, oldmodel, Enums.DataOpType.UPDATE.getId(), user); } }); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java index 294ce8f..145500a 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java @@ -9,7 +9,7 @@ import com.cowr.model.*; import com.cowr.service.ssjygl.base.BaseSyncService; import com.cowr.service.ssjygl.main.SvrCacheData; import com.cowr.service.ssjygl.synctask.SyncTaskService; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.service.ssjygl.modifylog.ModifyLogSyncService; import com.cowr.ssjygl.order.ordercluster.OrderclusterService; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; @@ -134,7 +134,7 @@ public class PrepayTruckSyncService extends BaseSyncService { } return SyncTaskService.me.save(synctask, supermarket_id) - && ModifyLogService.me.save(PrepayTruck.tablename, "id", logrecord.toJson(), Enums.DataOpType.SAVE.getId(), sysuser); + && ModifyLogSyncService.me.save(PrepayTruck.tablename, "id", logrecord.toJson(), Enums.DataOpType.SAVE.getId(), sysuser); } }); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java index e74cde1..b349ef5 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java @@ -7,7 +7,7 @@ import com.cowr.model.*; import com.cowr.service.ssjygl.base.BaseSyncService; import com.cowr.service.ssjygl.synctask.SyncTaskService; import com.cowr.service.ssjygl.system.sysuser.SysuserSyncService; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.service.ssjygl.modifylog.ModifyLogSyncService; import com.cowr.ssjygl.prepay.prepaycustomer.PrepayCustomerService; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; @@ -82,7 +82,7 @@ public class RefundDetailSyncService extends BaseSyncService { synctask.addSaveData(his); return SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, null, Enums.DataOpType.SAVE.getId(), user); + && ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), user); } }); @@ -177,7 +177,7 @@ public class RefundDetailSyncService extends BaseSyncService { synctask.addSaveData(his); return SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, oldmodel, Enums.DataOpType.UPDATE.getId(), user); + && ModifyLogSyncService.me.save(model, oldmodel, Enums.DataOpType.UPDATE.getId(), user); } }); @@ -282,7 +282,7 @@ public class RefundDetailSyncService extends BaseSyncService { synctask.addSaveData(his); return SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, oldmodel, Enums.DataOpType.UPDATE.getId(), user); + && ModifyLogSyncService.me.save(model, oldmodel, Enums.DataOpType.UPDATE.getId(), user); } catch (Exception e) { log.error(e.getMessage(), e); return false; diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketSyncService.java index 39e92c3..1986711 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketSyncService.java @@ -6,7 +6,7 @@ import com.cowr.model.*; import com.cowr.service.ssjygl.base.BaseSyncService; import com.cowr.service.ssjygl.main.SvrCacheData; import com.cowr.service.ssjygl.synctask.SyncTaskService; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.service.ssjygl.modifylog.ModifyLogSyncService; import com.jfinal.log.Log; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.IAtom; @@ -92,7 +92,7 @@ public class SupermarketSyncService extends BaseSyncService { } return ret && SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(sp, null, Enums.DataOpType.SAVE.getId(), sysuser); + && ModifyLogSyncService.me.save(sp, null, Enums.DataOpType.SAVE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -138,7 +138,7 @@ public class SupermarketSyncService extends BaseSyncService { return ret && sp.delete() && SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(sp, null, Enums.DataOpType.DELETE.getId(), sysuser); + && ModifyLogSyncService.me.save(sp, null, Enums.DataOpType.DELETE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java index 9dce983..c25e9e2 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java @@ -13,7 +13,7 @@ import com.cowr.service.ssjygl.customer.register.CustomerRegisterService; import com.cowr.service.ssjygl.main.Config; import com.cowr.service.ssjygl.main.SvrCacheData; import com.cowr.service.ssjygl.synctask.SyncTaskService; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.service.ssjygl.modifylog.ModifyLogSyncService; import com.jfinal.kit.HashKit; import com.jfinal.kit.StrKit; import com.jfinal.log.Log; @@ -252,7 +252,7 @@ public class SysuserSyncService extends BaseSyncService { public boolean run() throws SQLException { try { return model.save() && SyncTaskService.me.save(new SyncTask().addSaveData(model)) - && ModifyLogService.me.save(model, null, Enums.DataOpType.SAVE.getId(), tokenuser); + && ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), tokenuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -328,7 +328,7 @@ public class SysuserSyncService extends BaseSyncService { } return SyncTaskService.me.save(new SyncTask().addUpdateData(chkobj)) - && ModifyLogService.me.save(chkobj, old, Enums.DataOpType.UPDATE.getId(), tokenuser); + && ModifyLogSyncService.me.save(chkobj, old, Enums.DataOpType.UPDATE.getId(), tokenuser); } }); @@ -403,7 +403,7 @@ public class SysuserSyncService extends BaseSyncService { synctask.addSaveData(receiver); - ret = receiver.save() && ModifyLogService.me.save(receiver, null, Enums.DataOpType.SAVE.getId(), tokenuser); + ret = receiver.save() && ModifyLogSyncService.me.save(receiver, null, Enums.DataOpType.SAVE.getId(), tokenuser); if (!ret) { return false; @@ -416,7 +416,7 @@ public class SysuserSyncService extends BaseSyncService { synctask.addSaveData(customer); return model.save() && SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, null, Enums.DataOpType.SAVE.getId(), tokenuser); + && ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), tokenuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -519,7 +519,7 @@ public class SysuserSyncService extends BaseSyncService { synctask.addSaveData(receiver); ret = receiver.save() - && ModifyLogService.me.save(receiver, null, Enums.DataOpType.SAVE.getId(), tokenuser); + && ModifyLogSyncService.me.save(receiver, null, Enums.DataOpType.SAVE.getId(), tokenuser); } else { CustomerReceiver oldreceiver = receiver.clone(); receiver.setName(receiver_name); @@ -528,7 +528,7 @@ public class SysuserSyncService extends BaseSyncService { synctask.addUpdateData(receiver); ret = receiver.update() - && ModifyLogService.me.save(receiver, oldreceiver, Enums.DataOpType.UPDATE.getId(), tokenuser); + && ModifyLogSyncService.me.save(receiver, oldreceiver, Enums.DataOpType.UPDATE.getId(), tokenuser); } if (!ret) { @@ -537,7 +537,7 @@ public class SysuserSyncService extends BaseSyncService { } return SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(chkobj, old, Enums.DataOpType.UPDATE.getId(), tokenuser); + && ModifyLogSyncService.me.save(chkobj, old, Enums.DataOpType.UPDATE.getId(), tokenuser); } }); @@ -585,7 +585,7 @@ public class SysuserSyncService extends BaseSyncService { } return SyncTaskService.me.save(new SyncTask().addUpdateData(sysuser)) - && ModifyLogService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser); + && ModifyLogSyncService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser); } }); @@ -643,7 +643,7 @@ public class SysuserSyncService extends BaseSyncService { } return SyncTaskService.me.save(new SyncTask().addUpdateData(sysuser)) - && ModifyLogService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser); + && ModifyLogSyncService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser); } }); @@ -692,7 +692,7 @@ public class SysuserSyncService extends BaseSyncService { } return SyncTaskService.me.save(new SyncTask().addUpdateData(sysuser)) - && ModifyLogService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser); + && ModifyLogSyncService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser); } }); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckSyncService.java index 604e72c..c198423 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckSyncService.java @@ -7,7 +7,7 @@ import com.cowr.common.view.Result; import com.cowr.model.*; import com.cowr.service.ssjygl.base.BaseSyncService; import com.cowr.service.ssjygl.synctask.SyncTaskService; -import com.cowr.ssjygl.modifylog.ModifyLogService; +import com.cowr.service.ssjygl.modifylog.ModifyLogSyncService; import com.jfinal.log.Log; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.IAtom; @@ -47,7 +47,7 @@ public class TruckSyncService extends BaseSyncService { return ret && SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser); + && ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -112,7 +112,7 @@ public class TruckSyncService extends BaseSyncService { try { return model.update() && SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -165,7 +165,7 @@ public class TruckSyncService extends BaseSyncService { return ret && SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogSyncService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false;