sync app and slb after add/update

This commit is contained in:
Mengyi Zhou 2015-04-01 18:53:45 +08:00
parent 200a5631ce
commit 5368c824c1
5 changed files with 10 additions and 10 deletions

View file

@ -48,8 +48,6 @@ public class AppSyncImpl implements AppSync {
appDao.insert(d);
sync(d, app);
d = appDao.findByPK(d.getKeyId(), AppEntity.READSET_FULL);
app.setVersion(d.getVersion());
return d;
}

View file

@ -56,8 +56,6 @@ public class SlbSyncImpl implements SlbSync {
slbDao.insert(d);
sync(d, slb);
d = slbDao.findByPK(d.getKeyId(), SlbEntity.READSET_FULL);
slb.setVersion(d.getVersion());
return d;
}

View file

@ -67,16 +67,16 @@ public class AppRepositoryImpl implements AppRepository {
@Override
public long add(App app) throws Exception {
AppDo d = appSync.add(app);
archiveService.archiveApp(C.toApp(d));
archiveService.archiveApp(appQuery.getById(d.getId()));
return d.getKeyId();
}
@Override
public void update(App app) throws Exception {
app = C.toApp(appSync.update(app));
AppDo d = appSync.update(app);
app = appQuery.getById(d.getId());
archiveService.archiveApp(app);
}
@Override

View file

@ -2,6 +2,7 @@ package com.ctrip.zeus.service.model.impl;
import com.ctrip.zeus.dal.core.NginxServerDao;
import com.ctrip.zeus.dal.core.NginxServerDo;
import com.ctrip.zeus.dal.core.SlbDo;
import com.ctrip.zeus.model.entity.AppSlb;
import com.ctrip.zeus.model.entity.Slb;
import com.ctrip.zeus.model.entity.SlbServer;
@ -85,7 +86,8 @@ public class SlbRepositoryImpl implements SlbRepository {
if (slb == null)
return;
slb = C.toSlb(slbSync.add(slb));
SlbDo d = slbSync.add(slb);
slb = slbQuery.getById(d.getId());
archiveService.archiveSlb(slb);
for (SlbServer slbServer : slb.getSlbServers()) {
@ -102,8 +104,8 @@ public class SlbRepositoryImpl implements SlbRepository {
if (slb == null)
return;
slb = C.toSlb(slbSync.update(slb));
archiveService.archiveSlb(slb);
SlbDo d = slbSync.update(slb);
archiveService.archiveSlb(slbQuery.getById(d.getId()));
for (SlbServer slbServer : slb.getSlbServers()) {
nginxServerDao.insert(new NginxServerDo()

View file

@ -29,6 +29,8 @@ public class C {
public static AppSlb toAppSlb(AppSlbDo d) {
return new AppSlb()
.setAppName(d.getAppName())
.setSlbName(d.getSlbName())
.setPath(d.getPath());
}