Commit 64baf84c 64baf84c45d59f04a51fa51964089d25e34fe47d by root

save

1 parent c08edf5c
......@@ -19,6 +19,8 @@ public class DevInfo implements IDevInfo {
private Db db=new Db(Paths.BEAN_DEVINFO);
private DevInfoBean devinfobean;
public boolean set(DevInfoBean m) {
return db.create(m);
}
......@@ -27,4 +29,14 @@ public class DevInfo implements IDevInfo {
return (DevInfoBean)db.select();
}
public void init() {
devinfobean=new DevInfoBean();
devinfobean.setDescription("Описание устройства");
devinfobean.setGuid("00000000-0000-0000-0000-000000000000");
set(devinfobean);
}
}
......
......@@ -14,5 +14,7 @@ public interface IDevInfo {
public boolean set(DevInfoBean m);
public DevInfoBean get();
public void init();
}
......
......@@ -50,7 +50,6 @@ public class DnsLinux implements IDns{
}
public boolean Update(Vector<DnsBean> beans) {
return Config(beans);
......@@ -119,6 +118,18 @@ public class DnsLinux implements IDns{
return false;
}
public void init() {
dbs=new Vector<DnsBean>();
db=new DnsBean();
db.setIp("8.8.8.8");
dbs.add(db);
Config(dbs);
}
}
......
......@@ -14,6 +14,8 @@ public interface IDns {
public boolean Config(Vector<DnsBean> dbs);
public Vector<DnsBean> getAllDns();
public void init();
}
......
......@@ -6,5 +6,7 @@ public interface INtp {
public boolean setUsNtpServer(String value);
public void init();
}
......
......@@ -64,6 +64,12 @@ public class NtpLinux implements INtp {
return true;
}
public void init() {
setUsNtpServer("127.0.0.1");
}
}
......
......@@ -15,7 +15,7 @@ public class Paths {
public static final String BEAN_DEVINFO=dirBeans+"DevInfo.xml";
public static final String BEAN_DNS=dirBeans+"DnsBeans.xml";
public static final String BEAN_PROXY=dirBeans+"ProxyBeans.xml";
public static final String BEAN_REMOTESERVER=dirBeans+"RemoteServerBeans.xml";
public static final String BEAN_REMOTESERVER=dirBeans+"ServersBeans.xml";
public static final String BEAN_SV=dirBeans+"SvBeans.xml";
public static final String BEAN_SETTINGS=dirBeans+"SettingsBeans.xml";
......
......@@ -28,7 +28,6 @@ public class Servers implements IServers {
public Vector<ServerBean> get() {
return (Vector<ServerBean>)db.select();
}
......@@ -47,10 +46,8 @@ public void init() {
rsb.setTitle("");
beans.add(rsb);
set(beans);
set(beans);
}
}
......
......@@ -3,6 +3,8 @@ package org.emercit.utilstools;
import org.emercit.utilstools.model.SettingsBean;
import org.emercit.utilstools.service.Settings;
import org.emercit.devinfo.model.DevInfoBean;
public class App
{
......@@ -14,9 +16,11 @@ public class App
Settings settings=new Settings();
SettingsBean sb=settings.make();
settings.init();
settings.set(sb);
}
......
......@@ -6,12 +6,14 @@ import org.emercit.utilstools.model.SettingsBean;
public interface ISettings {
public SettingsBean get();
//public SettingsBean get();
public boolean set(SettingsBean bean);
public boolean configuring();
public boolean configuring(SettingsBean model);
public SettingsBean make();
public void init();
}
......
......@@ -3,9 +3,14 @@ package org.emercit.utilstools.service;
import java.util.Vector;
import org.emercit.utilstools.model.SettingsBean;
import org.emercit.xmldbmanager.service.Db;
import org.emercit.projecttools.constants.Paths;
import org.emercit.dtmanager.model.DateInfo;
import org.emercit.ethmanager.model.EthBean;
import org.emercit.devinfo.service.DevInfo;
import org.emercit.dnsmanager.service.DnsLinux;
import org.emercit.dtmanager.service.NtpLinux;
......@@ -39,21 +44,44 @@ public class Settings implements ISettings {
private Sv sv=new Sv();
private SettingsBean sb;
/*
public SettingsBean get() {
return (SettingsBean)db.select();
}
*/
public boolean set(SettingsBean bean) {
return db.create(bean);
}
public boolean configuring() {
/*
* Применение конфигурации из карты настроек
* @see org.emercit.utilstools.service.ISettings#configuring()
*/
public boolean configuring(SettingsBean model) {
devinfo.set(model.getDevInfoBean());
dnslinux.Config(model.getDnsbeans());
DateInfo dateinfo=model.getDateInfo();
ntplinux.setUsNtpServer(dateinfo.getNtp());
gsm.set(model.getGSMBean());
for (EthBean eb:model.getEthBeans()) {
ethlinux.Update(eb);
}
proxylinux.Config(model.getProxyBeans());
remserv.set(model.getRserverbeans());
return true;
}
......@@ -81,6 +109,26 @@ public class Settings implements ISettings {
}
public void init(){
devinfo.init();
dnslinux.init();
ntplinux.init();
gsm.init();
ethlinux.setDefaults();
proxylinux.init();
remserv.init();
sb=new SettingsBean();
sb=make();
set(sb);
}
......