From 0cd906c45db3badb02753a1988904ca7876b6d1a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139.mshome.net>
Date: 星期三, 09 一月 2019 16:03:56 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction$2.class | 0
gx_tieta/WebRoot/bat-set-test.jsp | 27 ++++++++-
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$3.class | 0
gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java | 39 +++++++++++++
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java | 11 +++
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_sysparamService.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$2.class | 0
gx_tieta/WebRoot/batch-set-curr.jsp | 36 +++++++++--
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$1.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.class | 0
gx_tieta/WebRoot/iframe/setcurr.html | 6 +-
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java | 26 ++++++++
13 files changed, 131 insertions(+), 14 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction$2.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction$2.class
new file mode 100644
index 0000000..49f2a19
--- /dev/null
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction$2.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class
index 9c9ea09..169295e 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$1.class
index 2496862..5c6d8e0 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$2.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$2.class
index 283c279..6ed2a79 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$2.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$2.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$3.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$3.class
index 5b0b86a..3dc908d 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$3.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$3.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.class
index 9d10b9e..684e72b 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_sysparamService.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_sysparamService.class
index 1357448..ea218c7 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_sysparamService.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_sysparamService.class
Binary files differ
diff --git a/gx_tieta/WebRoot/bat-set-test.jsp b/gx_tieta/WebRoot/bat-set-test.jsp
index b541d2c..4f0944c 100644
--- a/gx_tieta/WebRoot/bat-set-test.jsp
+++ b/gx_tieta/WebRoot/bat-set-test.jsp
@@ -120,8 +120,8 @@
<div class="layui-form-item">
<div class="layui-input-block">
<select name="sysType" id="sysType" lay-filter="sysType" lay-search="">
- <option value="12">1U璁惧</option>
- <option value="2">2U璁惧</option>
+ <option value="12">12V璁惧</option>
+ <option value="2">2V璁惧</option>
</select>
</div>
</div>
@@ -818,6 +818,8 @@
batchSetBattParams(rsData, keyIds);
});
+ // 璁剧疆娣诲姞鎿嶄綔鐨勫瓧绗︿覆
+ var addBattStr = '';
// 鎵归噺璁剧疆鏀剧數鍙傛暟
function batchSetBattParams(params, keys) {
// 鍒ゆ柇data鐨勫�兼槸鍚︿负绌�
@@ -833,7 +835,7 @@
type: 'post'
,async: true
,url: 'Fbs9100_battparamAction_action_updatePro'
- ,data: 'json='+JSON.stringify(params)
+ ,data: 'json='+JSON.stringify(params)+'&json_msg='+addBattStr
,dataType: 'json'
,success: function(res) {
var rs = JSON.parse(res.result);
@@ -906,12 +908,22 @@
var rs = JSON.parse(res.result);
//console.log(rs);
var data = [];
+ addBattStr = ''; // 鍒濆鍖栧瓧绗︿覆
if(rs.code == 1) {
data = rs.data;
data = formatSearchData(data);
}else {
layer.msg('娌℃湁鍙缃殑鐢垫睜缁�!');
}
+ // 濡傛灉鏈夋坊鍔犵殑鏁版嵁
+ if(data.length !=0) {
+ if(addBattStr.length == 0) { // 瀛楃涓查暱搴︿负0
+ addBattStr += getFilterStr(temp);
+ }else {
+ addBattStr += ','+getFilterStr(temp);
+ }
+ }
+
tOptions.data = data;
//console.log(data);
// 鐢熸垚琛ㄦ牸鏁版嵁
@@ -1072,6 +1084,15 @@
}
return rs;
}
+
+ // 鑾峰彇绛涢�夋潯浠剁殑瀛楃涓�
+ function getFilterStr(data) {
+ var rsString = '';
+ rsString += data.StationName;
+ rsString += '-'+data.MonVolStd+'V璁惧';
+ rsString += '-'+(data.GroupIndexInFBSDevice == '0'?'鐢垫睜缁�1': '鐢垫睜缁�2');
+ return rsString;
+ }
});
</script>
</body>
diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
index 3f3015e..582651d 100644
--- a/gx_tieta/WebRoot/batch-set-curr.jsp
+++ b/gx_tieta/WebRoot/batch-set-curr.jsp
@@ -117,8 +117,8 @@
<div class="layui-form-item">
<div class="layui-input-block">
<select name="sysType" id="sysType" lay-filter="sysType" lay-search="">
- <option value="12">1U璁惧</option>
- <option value="2">2U璁惧</option>
+ <option value="12">12V璁惧</option>
+ <option value="2">2V璁惧</option>
</select>
</div>
</div>
@@ -565,6 +565,7 @@
// 鐐瑰嚮娣诲姞鐢垫睜缁�
$('#setCurrIframe').data('setCurr', []);
+
$('#batchAdd').click(function() {
var structData = structAddData();
// 鍒ゆ柇鏄惁閫夋嫨瑕佹坊鍔犵殑鍐呭
@@ -578,7 +579,8 @@
});
-
+ // 璁剧疆娣诲姞鎿嶄綔鐨勫瓧绗︿覆
+ var addBattStr = '';
// 鏌ヨ姝ｅ湪鏀剧數鐨勮澶�
function searchChargeDev(callback, cParam, isCallback) {
var rq = structAddData(); // 鑾峰彇鏌ヨ鏉′欢
@@ -589,6 +591,8 @@
devType = preDevType;
// 璁惧绫诲瀷鐨勬潯浠舵敼鍙樻竻绌鸿〃鏍�
tOptions.data = [];
+ // 娓呯┖瀛楃涓�
+ addBattStr = '';
// 鏌ヨ姝ｅ湪鏀剧數鐨勫唴瀹�
$.ajax({
type: 'post'
@@ -667,6 +671,15 @@
var data = [];
if(rs.code == 1) {
data = getFilterData(rs.data, tOptions.data);
+ }
+
+ // 濡傛灉鏈夋坊鍔犵殑鏁版嵁
+ if(data.length !=0) {
+ if(addBattStr.length == 0) { // 瀛楃涓查暱搴︿负0
+ addBattStr += getFilterStr(temp);
+ }else {
+ addBattStr += ','+getFilterStr(temp);
+ }
}
// 灏嗘暟鎹坊鍔犲埌琛ㄦ牸涓�
for(var i=0; i<data.length; i++) {
@@ -790,14 +803,14 @@
// 璇锋眰璁剧疆鍙傛暟
function ajaxSetParam(param) {
- console.log(param);
+ //console.log(param);
var load = layer.load(1);
// 璇锋眰鍚庡彴
$.ajax({
type: 'post'
,async: true
,url: 'Fbs9100_setparamAction_action_updatePro'
- ,data: 'json='+JSON.stringify(param)
+ ,data: 'json='+JSON.stringify(param)+'&json_msg='+addBattStr // 娣诲姞鎿嶄綔璁板綍
,dataType: 'json'
,success: function(res) {
var rs = JSON.parse(res.result);
@@ -984,7 +997,7 @@
layer.msg('鏆傛棤鏃犳硶鍚姩,璇峰厛璁剧疆鏀剧數鍙傛暟!');
return;
}
-
+ $('#setCurrIframe').data('addBattStr', addBattStr);
// 鏄剧ず闈㈡澘
layer.open({
type: 2
@@ -1217,7 +1230,16 @@
}
return rs;
- }
+ }
+
+ // 鑾峰彇绛涢�夋潯浠剁殑瀛楃涓�
+ function getFilterStr(data) {
+ var rsString = '';
+ rsString += data.StationName;
+ rsString += '-'+data.MonVolStd+'V璁惧';
+ rsString += '-'+(data.GroupIndexInFBSDevice == '0'?'鐢垫睜缁�1': '鐢垫睜缁�2');
+ return rsString;
+ }
});
</script>
diff --git a/gx_tieta/WebRoot/iframe/setcurr.html b/gx_tieta/WebRoot/iframe/setcurr.html
index 29513e9..951acf5 100644
--- a/gx_tieta/WebRoot/iframe/setcurr.html
+++ b/gx_tieta/WebRoot/iframe/setcurr.html
@@ -51,8 +51,8 @@
var table = layui.table;
var setCurr = parent.$('#setCurrIframe').data('setCurr');
-
- console.log(setCurr);
+ var addBattStr = parent.$('#setCurrIframe').data('addBattStr');
+ console.log(addBattStr);
// 琛ㄦ牸妯″潡
var tOptions = {
elem: '#pageTbl'
@@ -133,7 +133,7 @@
type: 'post'
,async: true
,url: 'Fbs9100_setparamAction_action_updatePro_dis'
- ,data: 'json='+JSON.stringify(param)
+ ,data: 'json='+JSON.stringify(param)+'&json_msg='+addBattStr
,dataType: 'json'
,success: function(res) {
var rs = JSON.parse(res.result);
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java
index bfa3195..7569770 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java
@@ -51,6 +51,17 @@
result = tojson(model);
return SUCCESS;
}
+ //鎵归噺閲嶅惎璁惧
+ public String restartPL_FBS() {
+ List<Fbs9100_sysparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_sysparam>>(){}.getType());
+ ServiceModel model = service.restartPL_FBS(list);
+ { String msg="鎵归噺閲嶅惎"+json_msg+"鐨勮澶�";
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Batch, msg);
+ uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ }
+ result = tojson(model);
+ return SUCCESS;
+ }
//鏍规嵁璁惧id鏌ヨ绯荤粺鍙傛暟(涓�瀹氭槸琚鐞嗙殑)
public String serchByCondition(){
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
index da9e53f..347b4bb 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
@@ -21,6 +21,7 @@
import com.fgkj.dto.ram.FBS9100;
import com.fgkj.dto.ram.Fbs9100_setparam;
import com.fgkj.dto.ram.Fbs9100_state;
+import com.fgkj.dto.ram.Fbs9100_sysparam;
import com.fgkj.services.User_logService;
public class Fbs9100_setparamImpl implements BaseDAO,CallBack{
@@ -119,7 +120,30 @@
+ " op_cmd="+fs.getOp_cmd()+ ",TestCmd="+fs.getTestCmd()+ " WHERE dev_id= "+fs.getDev_id();
sql_str.add(sql);
{
- String msg="鍚姩"+fs.getDev_id()+"鏈烘埧鏀剧數鍙傛暟";
+ String msg="鍚姩"+fs.getDev_id()+"鏈烘埧鏀剧數";
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
+ listU.add(ulog);
+ }
+ }
+ }
+
+ Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+ (new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ return bl;
+ }
+ //鎵归噺閲嶅惎
+ public boolean restartPL_FBS(Object obj) {
+ List<Fbs9100_sysparam> list=(List<Fbs9100_sysparam>) obj;
+ ArrayList sql_str=new ArrayList();
+ List<User_log> listU=new ArrayList<User_log>();//瀛樻斁user_log
+ if(list!=null&&list.size()>0){
+ for (int i = 0; i < list.size(); i++) {
+ Fbs9100_sysparam fs=list.get(i);
+ String sql="UPDATE db_ram_db.tb_fbs9100_setparam SET "
+ + " op_cmd="+fs.getOp_cmd()+ " WHERE dev_id= "+fs.getDev_id();
+ sql_str.add(sql);
+ {
+ String msg="閲嶅惎"+fs.getDev_id()+"鏈烘埧";
User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
listU.add(ulog);
}
diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java
index cddb552..e764c06 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java
@@ -119,6 +119,45 @@
model.setMsg("淇敼澶辫触!");
}
return model;
+ }
+ //鎵归噺閲嶅惎璁惧
+ public ServiceModel restartPL_FBS(Object obj) {
+ boolean bl=(new Fbs9100_setparamImpl()).restartPL_FBS(obj);
+ if(bl) {
+ List<Fbs9100_sysparam> list=(List<Fbs9100_sysparam>) obj;
+ Calendar c = Calendar.getInstance();
+ //鐜板湪鐨勬椂闂�(鍗曚綅锛氭绉�)
+ long now_time = c.getTimeInMillis();
+ long time=0;
+ int success=0;
+ do {
+ for (int i = 0; i < list.size(); i++) {
+ Fbs9100_sysparam fs=new Fbs9100_sysparam();
+ fs=list.get(i);
+ if(fs.getNum()==0) {//鍓嶅彴浼犲弬璁剧疆
+ boolean b=(new Fbs9100_setparamImpl()).getCmdAck(fs.getOp_cmd(), fs.getDev_id());
+ if(b) {
+ success+=1;
+ list.get(i).setNum(1);
+ }
+ }
+ }
+ if(success==list.size()) {
+ break;
+ }
+ Calendar cl = Calendar.getInstance();
+ long moment_time = cl.getTimeInMillis();
+ time=moment_time-now_time;
+ }while(time<=5*1000);
+ model.setData(list);
+ model.setCode(1);
+ model.setSum(success);
+ model.setMsg("閲嶅惎鎴愬姛!");
+ }else {
+ model.setCode(0);
+ model.setMsg("閲嶅惎澶辫触!");
+ }
+ return model;
}
//鎵归噺璁剧疆绯荤粺鍙傛暟鏃讹紝鏍规嵁鐪佸競鍖猴紝鐢垫睜鍗曚綋鍨嬪彿锛堜紡鏁帮級锛岀粍鏁扮瓫閫夊嚭鐢垫睜缁勫苟璇诲彇瀹冪殑瀹為檯绯荤粺鍙傛暟
public ServiceModel serchBattinfAndParam(Object obj) {
--
Gitblit v1.9.1