xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

dev
lisai17@sina.com 2020-10-15 14:51:38 +08:00
parent 01953ff83d
commit a296ab03a9
17 changed files with 61 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java
View File

@ -91,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 = "20201015";
public static final String CLINET_VERSION = "20201015.1";
public static String getRootPath() {
return PathKit.getWebRootPath()

8
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/base/BaseSyncService.java
View File

@ -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.service.ssjygl.modifylog.ModifyLogSyncService;
import com.cowr.ssjygl.modifylog.ModifyLogService;
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))
&& ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser);
&& ModifyLogService.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))
&& ModifyLogSyncService.me.save(model, (BaseModel) model.findByPk(), Enums.DataOpType.DELETE.getId(), sysuser);
&& ModifyLogService.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))
&& ModifyLogSyncService.me.save(model, saveold, Enums.DataOpType.UPDATE.getId(), sysuser);
&& ModifyLogService.me.save(model, saveold, Enums.DataOpType.UPDATE.getId(), sysuser);
} catch (Exception e) {
log.error(e.getMessage(), e);
return false;

10
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/blacklist/BlacklistSyncService.java
View File

@ -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.service.ssjygl.modifylog.ModifyLogSyncService;
import com.cowr.ssjygl.modifylog.ModifyLogService;
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()
&& ModifyLogSyncService.me.save(truck, oldtruck, Enums.DataOpType.UPDATE.getId(), sysuser);
&& ModifyLogService.me.save(truck, oldtruck, Enums.DataOpType.UPDATE.getId(), sysuser);
}
}
return ret
&& SyncTaskService.me.save(synctask)
&& ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser);
&& ModifyLogService.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()
&& ModifyLogSyncService.me.save(truck, oldtruck, Enums.DataOpType.UPDATE.getId(), sysuser);
&& ModifyLogService.me.save(truck, oldtruck, Enums.DataOpType.UPDATE.getId(), sysuser);
}
}
return ret
&& SyncTaskService.me.save(synctask)
&& ModifyLogSyncService.me.save(model, null, Enums.DataOpType.UPDATE.getId(), sysuser);
&& ModifyLogService.me.save(model, null, Enums.DataOpType.UPDATE.getId(), sysuser);
} catch (Exception e) {
log.error(e.getMessage(), e);
return false;

12
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/CustomerSyncService.java
View File

@ -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.service.ssjygl.modifylog.ModifyLogSyncService;
import com.cowr.ssjygl.modifylog.ModifyLogService;
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()
&& ModifyLogSyncService.me.save(receiver, null, Enums.DataOpType.SAVE.getId(), sysuser);
&& ModifyLogService.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)
&& ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser);
&& ModifyLogService.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()
&& ModifyLogSyncService.me.save(receiver, null, Enums.DataOpType.SAVE.getId(), sysuser);
&& ModifyLogService.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()
&& ModifyLogSyncService.me.save(receiver, oldreceiver, Enums.DataOpType.UPDATE.getId(), sysuser);
&& ModifyLogService.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)
&& ModifyLogSyncService.me.save(oldobj, saveold, Enums.DataOpType.UPDATE.getId(), sysuser);
&& ModifyLogService.me.save(oldobj, saveold, Enums.DataOpType.UPDATE.getId(), sysuser);
} catch (Exception e) {
log.error(e.getMessage(), e);
return false;

6
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/customer/register/CustomerRegisterService.java
View File

@ -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.service.ssjygl.modifylog.ModifyLogSyncService;
import com.cowr.ssjygl.modifylog.ModifyLogService;
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() && ModifyLogSyncService.me.save(register, old, Enums.DataOpType.UPDATE.getId(), user);
return register.update() && ModifyLogService.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) && ModifyLogSyncService.me.save(register, old, Enums.DataOpType.UPDATE.getId(), user);
return SyncTaskService.me.save(synctask) && ModifyLogService.me.save(register, old, Enums.DataOpType.UPDATE.getId(), user);
} catch (Exception e) {
log.error(e.getMessage(), e);
}

8
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/log/InvoiceLogSyncService.java
View File

@ -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.service.ssjygl.modifylog.ModifyLogSyncService;
import com.cowr.ssjygl.modifylog.ModifyLogService;
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)
&& ModifyLogSyncService.me.save(finalInvoiceLog, null, Enums.DataOpType.SAVE.getId(), sysuser);
&& ModifyLogService.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"))
&& ModifyLogSyncService.me.save(invoiceLog, old, Enums.DataOpType.UPDATE.getId(), sysuser);
&& ModifyLogService.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 ModifyLogSyncService.me.save(InvoiceLog.tablename, "id", logrecord.toJson(), Enums.DataOpType.SAVE.getId(), sysuser);
return ModifyLogService.me.save(InvoiceLog.tablename, "id", logrecord.toJson(), Enums.DataOpType.SAVE.getId(), sysuser);
} catch (Exception e) {
log.error(e.getMessage(), e);
return false;

4
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/invoice/receive/InvoiceReceiveSyncService.java
View File

@ -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.service.ssjygl.modifylog.ModifyLogSyncService;
import com.cowr.ssjygl.modifylog.ModifyLogService;
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()) // 下发到指定的砂站
&& ModifyLogSyncService.me.save(receive, null, Enums.DataOpType.SAVE.getId(), user);
&& ModifyLogService.me.save(receive, null, Enums.DataOpType.SAVE.getId(), user);
} catch (Exception e) {
log.error(e.getMessage(), e);
return false;

88
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/modifylog/ModifyLogSyncService.java
View File

@ -1,88 +0,0 @@
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;
}
}
});
}
}

10
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java
View File

@ -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.service.ssjygl.modifylog.ModifyLogSyncService;
import com.cowr.ssjygl.modifylog.ModifyLogService;
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())
&& ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser);
&& ModifyLogService.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())
&& ModifyLogSyncService.me.save(model, null, Enums.DataOpType.UPDATE.getId(), sysuser);
&& ModifyLogService.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())
&& ModifyLogSyncService.me.save(oldobj, null, Enums.DataOpType.UPDATE.getId(), sysuser);
&& ModifyLogService.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())
&& ModifyLogSyncService.me.save(oldobj, null, Enums.DataOpType.UPDATE.getId(), sysuser);
&& ModifyLogService.me.save(oldobj, null, Enums.DataOpType.UPDATE.getId(), sysuser);
} catch (Exception e) {
log.error(e.getMessage(), e);

4
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/truck/OrderclusterTruckSyncService.java
View File

@ -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.service.ssjygl.modifylog.ModifyLogSyncService;
import com.cowr.ssjygl.modifylog.ModifyLogService;
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())
&& ModifyLogSyncService.me.save(OrderclusterTruck.tablename, "id", logrecord.toJson(), Enums.DataOpType.SAVE.getId(), sysuser);
&& ModifyLogService.me.save(OrderclusterTruck.tablename, "id", logrecord.toJson(), Enums.DataOpType.SAVE.getId(), sysuser);
}
});

4
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordertemp/OrderTempSyncService.java
View File

@ -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.service.ssjygl.modifylog.ModifyLogSyncService;
import com.cowr.ssjygl.modifylog.ModifyLogService;
import com.cowr.ssjygl.prepay.prepaycustomer.PrepayCustomerService;
import com.jfinal.log.Log;
import com.jfinal.plugin.activerecord.Db;
@ -164,7 +164,7 @@ public class OrderTempSyncService {
synctask.addUpdateData(stock);
return ret && SyncTaskService.me.save(synctask, order.getSupermarketId())
&& ModifyLogSyncService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser);
&& ModifyLogService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser);
} catch (Exception e) {
log.error(e.getMessage(), e);
return false;

6
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaydetail/PrepayDetailSyncService.java
View File

@ -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.service.ssjygl.modifylog.ModifyLogSyncService;
import com.cowr.ssjygl.modifylog.ModifyLogService;
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)
&& ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), user);
&& ModifyLogService.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)
&& ModifyLogSyncService.me.save(model, oldmodel, Enums.DataOpType.UPDATE.getId(), user);
&& ModifyLogService.me.save(model, oldmodel, Enums.DataOpType.UPDATE.getId(), user);
}
});

4
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/prepaytruck/PrepayTruckSyncService.java
View File

@ -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.service.ssjygl.modifylog.ModifyLogSyncService;
import com.cowr.ssjygl.modifylog.ModifyLogService;
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)
&& ModifyLogSyncService.me.save(PrepayTruck.tablename, "id", logrecord.toJson(), Enums.DataOpType.SAVE.getId(), sysuser);
&& ModifyLogService.me.save(PrepayTruck.tablename, "id", logrecord.toJson(), Enums.DataOpType.SAVE.getId(), sysuser);
}
});

8
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java
View File

@ -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.service.ssjygl.modifylog.ModifyLogSyncService;
import com.cowr.ssjygl.modifylog.ModifyLogService;
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)
&& ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), user);
&& ModifyLogService.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)
&& ModifyLogSyncService.me.save(model, oldmodel, Enums.DataOpType.UPDATE.getId(), user);
&& ModifyLogService.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)
&& ModifyLogSyncService.me.save(model, oldmodel, Enums.DataOpType.UPDATE.getId(), user);
&& ModifyLogService.me.save(model, oldmodel, Enums.DataOpType.UPDATE.getId(), user);
} catch (Exception e) {
log.error(e.getMessage(), e);
return false;

6
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/SupermarketSyncService.java
View File

@ -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.service.ssjygl.modifylog.ModifyLogSyncService;
import com.cowr.ssjygl.modifylog.ModifyLogService;
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)
&& ModifyLogSyncService.me.save(sp, null, Enums.DataOpType.SAVE.getId(), sysuser);
&& ModifyLogService.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)
&& ModifyLogSyncService.me.save(sp, null, Enums.DataOpType.DELETE.getId(), sysuser);
&& ModifyLogService.me.save(sp, null, Enums.DataOpType.DELETE.getId(), sysuser);
} catch (Exception e) {
log.error(e.getMessage(), e);
return false;

22
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java
View File

@ -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.service.ssjygl.modifylog.ModifyLogSyncService;
import com.cowr.ssjygl.modifylog.ModifyLogService;
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))
&& ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), tokenuser);
&& ModifyLogService.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))
&& ModifyLogSyncService.me.save(chkobj, old, Enums.DataOpType.UPDATE.getId(), tokenuser);
&& ModifyLogService.me.save(chkobj, old, Enums.DataOpType.UPDATE.getId(), tokenuser);
}
});
@ -403,7 +403,7 @@ public class SysuserSyncService extends BaseSyncService {
synctask.addSaveData(receiver);
ret = receiver.save() && ModifyLogSyncService.me.save(receiver, null, Enums.DataOpType.SAVE.getId(), tokenuser);
ret = receiver.save() && ModifyLogService.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)
&& ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), tokenuser);
&& ModifyLogService.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()
&& ModifyLogSyncService.me.save(receiver, null, Enums.DataOpType.SAVE.getId(), tokenuser);
&& ModifyLogService.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()
&& ModifyLogSyncService.me.save(receiver, oldreceiver, Enums.DataOpType.UPDATE.getId(), tokenuser);
&& ModifyLogService.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)
&& ModifyLogSyncService.me.save(chkobj, old, Enums.DataOpType.UPDATE.getId(), tokenuser);
&& ModifyLogService.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))
&& ModifyLogSyncService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser);
&& ModifyLogService.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))
&& ModifyLogSyncService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser);
&& ModifyLogService.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))
&& ModifyLogSyncService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser);
&& ModifyLogService.me.save(sysuser, old, Enums.DataOpType.UPDATE.getId(), tokenuser);
}
});

8
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/truck/TruckSyncService.java
View File

@ -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.service.ssjygl.modifylog.ModifyLogSyncService;
import com.cowr.ssjygl.modifylog.ModifyLogService;
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)
&& ModifyLogSyncService.me.save(model, null, Enums.DataOpType.SAVE.getId(), sysuser);
&& ModifyLogService.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)
&& ModifyLogSyncService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser);
&& ModifyLogService.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)
&& ModifyLogSyncService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser);
&& ModifyLogService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser);
} catch (Exception e) {
log.error(e.getMessage(), e);
return false;