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

车辆限重管理

dev
lisai17@sina.com 2021-10-16 20:56:43 +08:00
parent 38954220fe
commit ff181c2aa0
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java
View File

@ -101,8 +101,6 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
oldobj.set(key, model.get(key)); oldobj.set(key, model.get(key));
} }
model.setCreateUserId(oldobj.getCreateUserId());
model.setCreateTime(oldobj.getCreateTime());
SyncTask synctask = new SyncTask(); SyncTask synctask = new SyncTask();
boolean ret = Db.tx(new IAtom() { boolean ret = Db.tx(new IAtom() {
@ -145,16 +143,16 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
} }
public Result delete(String truck_license, Sysuser sysuser) { public Result delete(String truck_license, Sysuser sysuser) {
TruckWeightLimit model = TruckWeightLimit.dao.findById(truck_license); TruckWeightLimit oldobj = TruckWeightLimit.dao.findById(truck_license);
if (model == null) { if (oldobj == null) {
return Result.failed(false, "按主键未找到对应记录"); return Result.failed(false, "按主键未找到对应记录");
} }
if (!model.hasDelKey()) { if (!oldobj.hasDelKey()) {
return Result.failed(false, "不存在逻辑删除字段"); return Result.failed(false, "不存在逻辑删除字段");
} }
TruckWeightLimit oldobj = model.clone(); TruckWeightLimit saveold = oldobj.clone();
oldobj.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_INVALID); // 逻辑删除字段统一用 del oldobj.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_INVALID); // 逻辑删除字段统一用 del
SyncTask synctask = new SyncTask(); SyncTask synctask = new SyncTask();
@ -164,9 +162,9 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
try { try {
TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog(); TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog();
modifyLog.setUuid(StrKit.getRandomUUID()); modifyLog.setUuid(StrKit.getRandomUUID());
modifyLog.setTruckLicense(model.getTruckLicense()); modifyLog.setTruckLicense(oldobj.getTruckLicense());
modifyLog.setWeightLimit(model.getWeightLimit()); modifyLog.setWeightLimit(oldobj.getWeightLimit());
modifyLog.setAttachment(model.getAttachment()); modifyLog.setAttachment(oldobj.getAttachment());
modifyLog.setState(3); modifyLog.setState(3);
modifyLog.setChangeUserId(sysuser.getId()); modifyLog.setChangeUserId(sysuser.getId());
modifyLog.setChangeUserName(sysuser.getName()); modifyLog.setChangeUserName(sysuser.getName());
@ -179,7 +177,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
synctask.addSaveData(modifyLog); synctask.addSaveData(modifyLog);
return SyncTaskService.me.save(synctask) return SyncTaskService.me.save(synctask)
&& ModifyLogService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser) && ModifyLogService.me.save(oldobj, saveold, Enums.DataOpType.UPDATE.getId(), sysuser)
&& ModifyLogService.me.save(modifyLog, null, Enums.DataOpType.SAVE.getId(), sysuser); && ModifyLogService.me.save(modifyLog, null, Enums.DataOpType.SAVE.getId(), sysuser);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
@ -209,6 +207,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
return Result.failed(false, "不存在逻辑删除字段"); return Result.failed(false, "不存在逻辑删除字段");
} }
TruckWeightLimit saveold = oldobj.clone();
oldobj.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_VALID); // 逻辑删除字段统一用 del oldobj.set(Const.LOGIC_DEL_KEY, Const.LOGIC_DEL_VALID); // 逻辑删除字段统一用 del
SyncTask synctask = new SyncTask(); SyncTask synctask = new SyncTask();
@ -219,9 +218,9 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
try { try {
TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog(); TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog();
modifyLog.setUuid(StrKit.getRandomUUID()); modifyLog.setUuid(StrKit.getRandomUUID());
modifyLog.setTruckLicense(model.getTruckLicense()); modifyLog.setTruckLicense(oldobj.getTruckLicense());
modifyLog.setWeightLimit(model.getWeightLimit()); modifyLog.setWeightLimit(oldobj.getWeightLimit());
modifyLog.setAttachment(model.getAttachment()); modifyLog.setAttachment(oldobj.getAttachment());
modifyLog.setState(4); modifyLog.setState(4);
modifyLog.setChangeUserId(sysuser.getId()); modifyLog.setChangeUserId(sysuser.getId());
modifyLog.setChangeUserName(sysuser.getName()); modifyLog.setChangeUserName(sysuser.getName());
@ -234,7 +233,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
synctask.addSaveData(modifyLog); synctask.addSaveData(modifyLog);
return SyncTaskService.me.save(synctask) return SyncTaskService.me.save(synctask)
&& ModifyLogService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser) && ModifyLogService.me.save(oldobj, saveold, Enums.DataOpType.UPDATE.getId(), sysuser)
&& ModifyLogService.me.save(modifyLog, null, Enums.DataOpType.SAVE.getId(), sysuser); && ModifyLogService.me.save(modifyLog, null, Enums.DataOpType.SAVE.getId(), sysuser);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
@ -243,6 +242,10 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
} }
}); });
if (ret) {
SyncTaskService.me.send(synctask);
}
return ret ? Result.object(oldobj) : Result.failed(false, "恢复失败"); return ret ? Result.object(oldobj) : Result.failed(false, "恢复失败");
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);

6
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/synctask/SyncTaskService.java
View File

@ -517,6 +517,12 @@ public class SyncTaskService {
} }
if (!sts.isEmpty()) { if (!sts.isEmpty()) {
for(SyncTask st : sts){
if(st.getSaveData() == null && st.getUpdateData() == null && st.getDeleteData() == null && st.getIncrementData() == null){
log.error("错误数据 %s", recvdata.toJSONString());
}
}
int[] ret = Db.batchSave(sts, sts.size()); int[] ret = Db.batchSave(sts, sts.size());
if (ret.length != sts.size()) { if (ret.length != sts.size()) {