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

.

dev
lisai17@sina.com 2020-10-13 15:06:57 +08:00
parent 4eccaff95c
commit 2593c24b55
1 changed files with 53 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/transport/TransportSyncService.java
View File

@ -279,18 +279,26 @@ public class TransportSyncService {
// 浠水只有外销
transport.setType(OrderTypeEnum.TEMP.getTypeid());
SyncTask synctask = new SyncTask();
File finalUploadfile = uploadfile;
boolean ret = Db.tx(new IAtom() {
@Override
public boolean run() {
try {
boolean ret = transport.save() && SyncTaskService.me.save(new SyncTask().addSaveData(transport));
boolean ret = transport.save();
if (ret && finalUploadfile != null) {
if (!ret) {
return false;
}
synctask.addSaveData(transport);
if (finalUploadfile != null) {
OssfileLogService.me.save(transport.getId(), transport.getFirstPic(), finalUploadfile.getAbsolutePath());
}
return ret;
return SyncTaskService.me.save(synctask);
} catch (Exception e) {
log.error(e.getMessage(), e);
return false;
@ -307,6 +315,9 @@ public class TransportSyncService {
CliCacheData.nowLicenseMap.put(which, result.getLicense());
CliCacheData.nowWeightMap.put(which, null);
// 数据库保存成功后，立马上传
SyncTaskService.me.send(synctask);
}
result.setTransportId(transport.getId());
@ -417,18 +428,26 @@ public class TransportSyncService {
// 浠水只有外销
transport.setType(OrderTypeEnum.TEMP.getTypeid());
SyncTask synctask = new SyncTask();
Transport finalTransport = transport;
ret = Db.tx(new IAtom() {
@Override
public boolean run() {
try {
boolean ret = finalTransport.save() && SyncTaskService.me.save(new SyncTask().addSaveData(finalTransport));
boolean ret = finalTransport.save();
if (ret && finalUploadfile != null) {
if (!ret) {
return false;
}
synctask.addSaveData(finalTransport);
if (finalUploadfile != null) {
OssfileLogService.me.save(finalTransport.getId(), finalTransport.getFirstPic(), finalUploadfile.getAbsolutePath());
}
return ret;
return SyncTaskService.me.save(synctask);
} catch (Exception e) {
log.error(e.getMessage(), e);
return false;
@ -436,6 +455,10 @@ public class TransportSyncService {
}
});
if (ret) {
SyncTaskService.me.send(synctask);
}
result.setTransportId(transport.getId());
result.setAccess(ret);
result.setFlow(Enums.CtrlFlowEnum.R.name());
@ -446,18 +469,26 @@ public class TransportSyncService {
transport.setOutWhich(which);
transport.setSecondPic(filekey);
SyncTask synctask = new SyncTask();
Transport finalTransport1 = transport;
ret = Db.tx(new IAtom() {
@Override
public boolean run() {
try {
boolean ret = finalTransport1.update() && SyncTaskService.me.save(new SyncTask().addUpdateData(finalTransport1));
boolean ret = finalTransport1.update();
if (ret && finalUploadfile != null) {
if (!ret) {
return false;
}
synctask.addUpdateData(finalTransport1);
if (finalUploadfile != null) {
OssfileLogService.me.save(finalTransport1.getId(), finalTransport1.getSecondPic(), finalUploadfile.getAbsolutePath());
}
return ret;
return SyncTaskService.me.save(synctask);
} catch (Exception e) {
log.error(e.getMessage(), e);
return false;
@ -676,7 +707,7 @@ public class TransportSyncService {
try {
boolean ret = transport.save();
if(!ret){
if (!ret) {
return false;
}
@ -739,17 +770,21 @@ public class TransportSyncService {
// 浠水只有外销
transport.setType(OrderTypeEnum.TEMP.getTypeid());
SyncTask synctask = new SyncTask();
boolean ret = Db.tx(new IAtom() {
@Override
public boolean run() {
try {
boolean ret = transport.save() && SyncTaskService.me.save(new SyncTask().addSaveData(transport));
boolean ret = transport.save();
if (ret) {
ret = saveLog(transport.toJson(), sysuser);
if (!ret) {
return false;
}
return ret;
synctask.addSaveData(transport);
return SyncTaskService.me.save(synctask) && saveLog(transport.toJson(), sysuser);
} catch (Exception e) {
log.error(e.getMessage(), e);
return false;
@ -757,6 +792,10 @@ public class TransportSyncService {
}
});
if (ret) {
SyncTaskService.me.send(synctask);
}
return ret ? Result.success(transport) : Result.failed("加入失败");
}