Skip to content

Дмитрий Корытько / hware

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 700ae381 700ae381d3eb8f675993eaeaac0763f8d20fd560 by root
Options

save

1 parent dea66014
Inline Side-by-side
Showing 19 changed files with 99 additions and 226 deletions
......@@ -8,6 +8,7 @@
<packaging>war</packaging>
<version>1.0.0-BUILD-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java-version>1.7</java-version>
<org.springframework-version>3.1.1.RELEASE</org.springframework-version>
<org.aspectj-version>1.6.10</org.aspectj-version>
......@@ -147,7 +148,7 @@
<dependency>
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<version>1.50</version>
<version>1.80</version>
</dependency>
<dependency>
......
......@@ -3,7 +3,7 @@
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<versioning>
<release>1.51</release>
<release>1.80</release>
<versions>
<version>1.0</version>
<version>1.1</version>
......@@ -52,7 +52,14 @@
<version>1.46</version>
<version>1.50</version>
<version>1.51</version>
<version>1.52</version>
<version>1.53</version>
<version>1.54</version>
<version>1.60</version>
<version>1.61</version>
<version>1.70</version>
<version>1.80</version>
</versions>
<lastUpdated>20150813132852</lastUpdated>
<lastUpdated>20150814140534</lastUpdated>
</versioning>
</metadata>
......
36c05f604b5a2389eadd82ff9a473bc2
\ No newline at end of file
53a52e0c68d3baed1d568dd835971a3d
\ No newline at end of file
......
2434c8c356890462296365b3031f71da4d66ee1f
\ No newline at end of file
f4ccba1c9d2fea75ed0fa68fdb7cea6bc154d9f5
\ No newline at end of file
......
......@@ -30,11 +30,12 @@ import org.emercit.devtools.service.SvService;
import org.emercit.utilstools.svmanager.model.SvBean;
@Controller
@RequestMapping("api")
public class SvController {
@RequestMapping(value = "sv/all", method = RequestMethod.GET)
public @ResponseBody Vector<SvBean> getAllSv() {
......@@ -54,7 +55,6 @@ public class SvController {
return Msg.getMsgResultByCode(SvService.INSTANCE.Start(bean));
}
@RequestMapping(value="sv/stop" , method = RequestMethod.POST)
public @ResponseBody MsgResult stop(@RequestBody SvBean bean) {
......
......@@ -43,7 +43,13 @@ public enum SvService {
svbeans=sv.get();
for (SvBean s:svbeans) { // проверяем запущен или остановлен
try { s.setIsrun(st.IsRun(s.getProcess())); } catch (Exception e) { log.error(e.getMessage());};
try {
s.setIsrun(st.IsRun(s.getProcess()));
} catch (Exception e) {
log.error(e.getMessage());
};
}
return svbeans;
}
......
......@@ -195,7 +195,7 @@ Ext.application({
},
/*
{
title: 'GPRS',
items:[{
......@@ -206,7 +206,7 @@ Ext.application({
},
*/
]
},
......@@ -214,10 +214,7 @@ Ext.application({
]
},
/*
{
title: 'СЕРВИСЫ',
items:[
......@@ -232,6 +229,7 @@ Ext.application({
}
]
},
*/
{
title: 'НАСТРОЙКИ',
......@@ -293,10 +291,6 @@ Ext.application({
}]
});
Ext.getBody().unmask();
}
});
......
......@@ -6,175 +6,16 @@ Ext.define('App.controller.Sv', {
'toolbar button[action=loadSv]': {
click : this.loadSv
},
'mvvm-DnsView': {
selectionchange: this.gridSelectionChange,
viewready: this.onViewReady,
select: this.onRowSelect
},
'mvvm-DnsView': {
edit: this.onRowEdit,
beforeedit: this.onRowBeforeEdit
}
});
},
saveDns:function(btn) {
var grid = btn.up('gridpanel');
var store = grid.getStore();
var records = [];
store.each(function(r){
records.push({
id: r.get("id"),
ip: r.get("ip")
});
});
var data=Ext.util.JSON.encode(records);
Ext.Ajax.request({
method: "POST",
url: 'api/dns/update',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
params: data,
success: function(response, opts) {
var Ok = Ext.JSON.decode(response.responseText);
if (Ok) {
Ext.Msg.alert('Success', 'Сохранение выполнено успешно');
}else {
Ext.Msg.alert('Failure', 'Ошибка сохранения');
}
}, failure: function(response, opts) {
Ext.Msg.alert('Failure', 'Ошибка сохранения');
}
});
//fires create, update and delete request when calling sync and commit changes in the store when autoSync=false
/*
store.sync({
success : function(batch, eOpts){
Ext.Msg.alert('Status', 'Changes saved successfully.');
},
failure : function(record, eOpts){
Ext.Msg.alert('Status', 'Request failed.');
}
});
*/
},
loadSv:function(btn) {
var grid = btn.up('gridpanel');
var store = grid.getStore();
store.load();
},
onRowEdit:function(editor, context, eOpts) {
},
onRowBeforeEdit:function() {
},
newDns : function(btn) {
var grid = btn.up('gridpanel');
var store = grid.getStore();
var rowEditing=grid.getPlugin('modelDnsEditPlagin');
rowEditing.cancelEdit();
var records = grid.getStore().getRange();
var r = Ext.create('App.model.Dns', {
id: records.length,
ip: '8.8.8.8',
});
store.insert(0, r);
var records = [];
store.each(function(r){
records.push({
id: r.get("id"),
ip: r.get("ip")
});
});
rowEditing.startEdit(0, 0);
},
delDns:function(btn) {
var grid = btn.up('gridpanel');
var store=grid.getStore();
var selectedRows = grid.getSelectionModel().getSelection();
if(selectedRows.length) {
store.remove(selectedRows);
} else {
Ext.Msg.alert('Статус', 'Выберите запись');
}
},
gridSelectionChange:function(selModel, selections, eOpts) {
/*
var grid = selModel.view.ownerCt;
var btnDelete=grid.down('button[itemId=deleteDnsButton]');
btnDelete.setDisabled(false);
console.log(selections[0].data);
var json=Ext.util.JSON.encode(selections[0].data);
console.log(json);
*/
},
onViewReady:function() {
},
onRowSelect: function(selModel, record, index, opts) {
}
});
......
......@@ -140,9 +140,7 @@ Ext.define('App.view.Sv', {
handler: function(grid, rowIndex, colIndex) {
var rec = grid.getStore().getAt(rowIndex);
var data=Ext.util.JSON.encode(rec.data);
grid.mask("Остановка...");
Ext.Ajax.request({
method: "POST",
url: 'api/sv/stop',
......@@ -153,17 +151,11 @@ Ext.define('App.view.Sv', {
},
params:data,
success: function(response, opts) {
grid.unmask();
grid.store.load();
grid.getView().refresh();
var result = Ext.JSON.decode(response.responseText);
Ext.Msg.alert(result.type+" "+"Код-"+result.code,result.message);
}, failure: function(response, opts) {
grid.unmask();
Ext.Msg.alert('Failure', 'Ошибка соединения');
......@@ -176,8 +168,10 @@ Ext.define('App.view.Sv', {
tooltip: 'Перезапустить',
handler: function(grid, rowIndex, colIndex) {
var rec = grid.getStore().getAt(rowIndex);
var data=Ext.util.JSON.encode(rec.data);
var data=Ext.util.JSON.encode(rec.data);
console.log(data);
grid.mask("Перезапуск...");
Ext.Ajax.request({
......@@ -190,17 +184,12 @@ Ext.define('App.view.Sv', {
},
params:data,
success: function(response, opts) {
grid.unmask();
grid.store.load();
grid.getView().refresh();
var result = Ext.JSON.decode(response.responseText);
Ext.Msg.alert(result.type+" "+"Код-"+result.code,result.message);
}, failure: function(response, opts) {
......
......@@ -67,7 +67,7 @@
<dependency>
<groupId>org.emercit</groupId>
<artifactId>utilstools</artifactId>
<version>1.51</version>
<version>1.70</version>
</dependency>
......
......@@ -258,7 +258,8 @@ public class DevToolsBean extends RoundPanel implements Externalizable {
btnStop.setEnabled(false);
try {
sshecex.setCmd("rm /etc/udev/rules.d/70-persistent-net.rules");
sshecex.Exec();
sshecex.setCmd("touch /etc/udev/rules.d/70-persistent-net.rules");
sshecex.Exec();
......
......@@ -21,12 +21,12 @@ public class Notification implements INotification {
}
public void playSiren() {
SZSTerminal.siren.sirenOn();
// SZSTerminal.siren.sirenOn();
}
public void stopSiren() {
SZSTerminal.siren.sirenOff();
// SZSTerminal.siren.sirenOff();
}
......
package org.emercit.szs.model;
public class SirenJNI {
/*
static {
System.loadLibrary("siren");
}
*/
public native void sirenOn();
......
......@@ -105,8 +105,8 @@ public class WebPost {
} catch (Exception e) {
log.error(e.getMessage());
log.error(MsgSzs.connectServerError);
//log.error(e.getMessage());
//log.error(MsgSzs.connectServerError);
SData.INSTANCE.setIsConnect(false);
......@@ -123,8 +123,8 @@ public class WebPost {
} catch (Exception ex) {
log.error(ex.getMessage());
log.error(MsgSzs.connectServerError);
//log.error(ex.getMessage());
//log.error(MsgSzs.connectServerError);
SData.INSTANCE.setIsConnect(false);
......
......@@ -86,14 +86,12 @@ public class SZSTerminal {
private static JFrame mainFrame;
private static JPanel mainPanel;
public static JPnlHeader jpnlheader;
public static JPnlCurrent pnlcurrent = new JPnlCurrent();
public static JPnlLog jpnllog = new JPnlLog();
public static JPnlContacts jpnlcontacts = new JPnlContacts();
public static JPnlControl jpnlcontrol = new JPnlControl();
public static SirenJNI siren = new SirenJNI();
//public static SirenJNI siren = new SirenJNI();
private static Timer ftdTimerMain = new Timer();
......@@ -196,11 +194,9 @@ public class SZSTerminal {
public static void main(String[] args) {
EventQueue.invokeLater(new Runnable() {
public void run() {
try {siren.sirenOff(); } catch (Exception e) {};
//try {siren.sirenOff(); } catch (Exception e) {};
mainFrame = new JFrame();
mainFrame.setSize(800, 600);
mainFrame.setUndecorated(false);
......
......@@ -26,12 +26,12 @@ public class DCalibratorBB implements DCalibrator {
public int Run(String cmd) {
try {
Vector<String> defaults=getDefContent();
Vector<String> params=cmdExec.Run(cmd);
File file = new File("/etc/X11/xorg.conf.d/99-calibration.conf");
File file = new File("/usr/share/X11/xorg.conf.d/10-evdev.conf");
if (!file.exists()) {
file.createNewFile();
......@@ -42,13 +42,49 @@ public class DCalibratorBB implements DCalibrator {
bw.write("#Generated by DisplayCalibrator\n");
for (int i=7;i<params.size();i++) {
defaults.add(params.get(i));
defaults.add("\n");
}
for (int i=0;i<defaults.size();i++) {
bw.write(defaults.get(i));
bw.write("Section \"InputClass\"\n");
bw.write("Identifier \"evdev pointer catchall\"\n");
bw.write("MatchIsPointer \"on\"\n");
bw.write("MatchDevicePath \"/dev/input/event*\"\n");
bw.write("Driver \"evdev\"\n");
bw.write("EndSection\n");
bw.write("\n");
bw.write("Section \"InputClass\"\n");
bw.write("Identifier \"evdev keyboard catchall\"\n");
bw.write("MatchIsKeyboard \"on\"\n");
bw.write("MatchDevicePath \"/dev/input/event*\"\n");
bw.write("Driver \"evdev\"\n");
bw.write("EndSection\n");
bw.write("\n");
bw.write("Section \"InputClass\"\n");
bw.write("Identifier \"evdev touchpad catchall\"\n");
bw.write("MatchIsTouchpad \"on\"\n");
bw.write("MatchDevicePath \"/dev/input/event*\"\n");
bw.write("Driver \"evdev\"\n");
bw.write("EndSection\n");
bw.write("\n");
bw.write("Section \"InputClass\"\n");
bw.write("Identifier \"evdev tablet catchall\"\n");
bw.write("MatchIsTablet \"on\"\n");
bw.write("MatchDevicePath \"/dev/input/event*\"\n");
bw.write("Driver \"evdev\"\n");
bw.write("EndSection\n");
bw.write("\n");
bw.write("Section \"InputClass\"\n");
bw.write("Identifier \"evdev touchscreen catchall\"\n");
bw.write("MatchIsTouchscreen \"on\"\n");
bw.write("MatchDevicePath \"/dev/input/event*\"\n");
bw.write("Driver \"evdev\"\n");
bw.write("EndSection\n");
bw.write("\n");
for (int i=8;i<params.size();i++) {
bw.write(params.get(i));
bw.write("\n");
}
bw.write("\n");
......@@ -62,14 +98,4 @@ public class DCalibratorBB implements DCalibrator {
}
}
/*
* Содержание файла по умолчанию
*/
public Vector<String> getDefContent() throws Exception {
return cmdExec.Run("cat /usr/share/X11/xorg.conf.d/10-evdev.conf");
}
}
......
......@@ -13,6 +13,7 @@ import org.emercit.utilstools.config.DefSettings;
import org.emercit.utilstools.config.Msg;
import org.emercit.utilstools.ethmanager.model.EthBean;
import org.emercit.utilstools.pckutils.cmd.CmdExec;
import org.emercit.utilstools.sshexec.SSHExec;
import org.emercit.utilstools.xmldbmanager.service.Db;
public class EthLinux implements IEth {
......@@ -21,12 +22,17 @@ public class EthLinux implements IEth {
private CmdExec cmdexec=new CmdExec();
private SSHExec sshexec=new SSHExec();
private Vector<EthBean> ebs=new Vector<EthBean>();
private Db db=new Db(Paths.BEAN_ETH);
private Vector<String> extinfo;
private String mac;
private EthBean emp;
public EthLinux() {
}
......@@ -43,7 +49,10 @@ public class EthLinux implements IEth {
buff=cmdexec.Run("ifup"+" "+name);
Thread.sleep(3000);
*/
Vector<String> buff=cmdexec.Run("/etc/init.d/networking restart");
sshexec.setCmd("/etc/init.d/networking restart");
sshexec.Exec();
Msg msg=Msg.RestartEthSucc;
return msg.getCode();
}catch(Exception e) {
......
......@@ -22,7 +22,7 @@ public class Reader {
try {
fis = new FileInputStream(Paths.UTILSTOOLS_LOGFILE);
reader = new BufferedReader(new InputStreamReader(fis));
reader = new BufferedReader(new InputStreamReader(fis,"UTF8"));
String line = reader.readLine();
while(line != null){
result.add(line);
......
......@@ -31,7 +31,6 @@ public class SvControl implements ISvControl {
this.svbean=svbean;
this.sshexec=new SSHExec();
}
/*
* Остановка процесса
......