From 582ab1900e62416b477e428a71d95c075ca43b8b Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 02 一月 2019 11:24:13 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele-param1.jsp | 1
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 3 +
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.java | 62 +++++++++++++++++++++++++++++++
gx_tieta/WebRoot/pwdChange.jsp | 2
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 2
gx_tieta/WebRoot/iframe/batt-info-add.html | 45 ++++++++++++++++++----
6 files changed, 105 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/ele-param1.jsp b/gx_tieta/WebRoot/ele-param1.jsp
index 7cd9197..7ac0de9 100644
--- a/gx_tieta/WebRoot/ele-param1.jsp
+++ b/gx_tieta/WebRoot/ele-param1.jsp
@@ -129,6 +129,7 @@
</div>
<!-- 瀛樺偍iframe -->
<div id="iframeEdit"></div>
+ <div id="iframeAddData"></div>
<!-- 鍏抽棴椤甸潰涓璱frame寮瑰嚭灞� -->
<div id="iframeClose"></div>
<script type="text/html" id="battGrouptools">
diff --git a/gx_tieta/WebRoot/iframe/batt-info-add.html b/gx_tieta/WebRoot/iframe/batt-info-add.html
index a541c9e..2f06466 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-add.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-add.html
@@ -17,6 +17,9 @@
font-size: 20px;
color: #FF5722;
}
+ .layui-not-show {
+ display: none;
+ }
</style>
</head>
<body>
@@ -92,7 +95,7 @@
</div>
</div>
</div>
- <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+ <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3 layui-not-show">
<div class="layui-block">
<label class="layui-form-label">璁惧ID<span class="red">*</span></label>
<div class="layui-input-block">
@@ -100,7 +103,7 @@
</div>
</div>
</div>
- <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+ <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3 layui-not-show">
<div class="layui-block">
<label class="layui-form-label">璁惧IP</label>
<div class="layui-input-block">
@@ -371,6 +374,22 @@
{{# }); }}
</div>
</script>
+ <script type="text/html" id="msgTpl">
+ <div style="width: 380px;" class="layui-form layui-form-pane">
+ <div class="layui-form-item">
+ <label class="layui-form-label">璁惧ID</label>
+ <div class="layui-input-block">
+ <input type="text" name="FBSDeviceId" disabled="" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ユ爣棰�" class="layui-input layui-bg-gray" value="{{d.FBSDeviceId}}">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璁惧IP</label>
+ <div class="layui-input-block">
+ <input type="text" name="FBSDeviceIP" disabled="" lay-verify="title" autocomplete="off" placeholder="璇疯緭鍏ユ爣棰�" class="layui-input layui-bg-gray" value="{{d.FbsDeviceIp}}">
+ </div>
+ </div>
+ </div>
+ </script>
<script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="../js/base.js"></script>
<script type="text/javascript" src="../src/layui.js"></script>
@@ -388,6 +407,9 @@
var monCapStds = [50, 100, 150, 200, 250, 300, 350, 400, 450, 500, 1000];
var battProducers = ['鍦ｉ槼', '鐞嗗＋', '閾舵嘲', '鍗楅兘', '鍙岀櫥', 'SENRY', '鑹鹃粯鐢�', '绉戝＋杈�', '涓版棩', '涓叴鑳芥淳', '鍏夊畤', '閮庤揪', '鑹捐鏂崕杈�', '闆勯煬', '椋庡竼', '鏂囬殕', '涓北'];
var monNums = [4, 24]
+
+ // 娣诲姞瀹屾垚鍚庢彁绀轰俊鎭殑妯℃澘
+ var msgTpl = $('#msgTpl').html();
editInfo.FbsDeviceIp = getDevIp(editInfo.FBSDeviceId); // 璁剧疆璁惧IP
editInfo.monCapStds = monCapStds; // 鏍囩О瀹归噺鍒楄〃
@@ -429,7 +451,7 @@
,useDate: '2018-09-18 00:00:00'
,install_user: '鍛靛懙'
};
-
+
// 娓叉煋鍐呭
laytpl(battInfoTpl).render(editInfo, function(html) {
$('#battInfo').html(html);
@@ -668,11 +690,18 @@
var model = eval('('+data.result+')');
//console.info(model);
if(model.code ==1){
- layer.msg('娣诲姞鎴愬姛锛�3绉掑悗闈㈡澘鑷姩鍏抽棴');
- setTimeout(function() {
- parent.$('#iframeClose').click();
- parent.$('#paging .search').click();
- }, 3000);
+ parent.layer.msg('娣诲姞鎴愬姛锛�3绉掑悗闈㈡澘鑷姩鍏抽棴');
+ // 鎻愮ず淇℃伅
+ laytpl(msgTpl).render(temp[0], function(html) {
+ parent.layer.open({
+ title: '閲嶈淇℃伅'
+ ,area: ['420px', 'auto']
+ ,content: html
+ });
+ });
+
+ parent.$('#iframeClose').click();
+ parent.$('#paging .search').click();
}else{
layer.msg('娣诲姞澶辫触锛�');
}
diff --git a/gx_tieta/WebRoot/pwdChange.jsp b/gx_tieta/WebRoot/pwdChange.jsp
index efa1adf..4643d35 100644
--- a/gx_tieta/WebRoot/pwdChange.jsp
+++ b/gx_tieta/WebRoot/pwdChange.jsp
@@ -97,7 +97,7 @@
cleanCookie("username", "password");
alert(model.msg+"璇烽噸鏂扮櫥褰�");
exitUser();
- window.location.href="zzlogin1.jsp";
+ window.location.href="login.jsp";
}else{
alert(model.msg);
}
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index f976d3b..5fb53e3 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -90,6 +90,9 @@
}
maxb++;
sql_str.add(sql);
+ String baoji_sql="REPLACE into db_user.tb_user_battgroup_baojigroup_battgroup(baoji_group_id,StationId,BattGroupId) " +
+ " SELECT baoji_group_id,'"+binf.getStationId()+"',"+binf.getBattGroupId()+" from db_user.tb_user_battgroup_baojigroup_usr where uid="+((User_inf)ActionUtil.getUser()).getUId();
+ sql_str.add(baoji_sql);
{
String msg="娣诲姞"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
index 3bda3d9..2cf11c7 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -139,7 +139,7 @@
",'"+binf.getBattProducer()+"','"+binf.getBattModel()+"','"+DAOHelper.sdf.format(binf.getBattProductDate())+"','"+DAOHelper.sdf.format(binf.getBattInUseDate())+"',"+binf.getLoad_curr()+",'"+binf.getInstall_user()+"',"+binf.getDisCurrMax()+",'"+binf.getStation_phone()+"',"+binf.getStation_install()+")";
sql_str.add(sql_insert_binf);
String baoji_sql="REPLACE into db_user.tb_user_battgroup_baojigroup_battgroup(baoji_group_id,StationId,BattGroupId) " +
- " SELECT baoji_group_id,'"+binf.getStationId()+"',"+binf.getBattGroupId()+" from db_user.tb_user_battgroup_baojigroup ";
+ " SELECT baoji_group_id,'"+binf.getStationId()+"',"+binf.getBattGroupId()+" from db_user.tb_user_battgroup_baojigroup_usr where uid="+bapply.getApply_uid();
sql_str.add(baoji_sql);
{
String msg="纭娣诲姞"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.java
index d032799..06804d9 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_sysparamImpl.java
@@ -11,8 +11,12 @@
import com.fgkj.dao.CallBack;
import com.fgkj.dao.DAOHelper;
import com.fgkj.dao.FBS9100_ComBase;
+import com.fgkj.dao.UinfDaoFactory;
import com.fgkj.db.DBUtil;
+import com.fgkj.dto.User_log;
+import com.fgkj.dto.ram.Fbs9100_setparam;
import com.fgkj.dto.ram.Fbs9100_sysparam;
+import com.fgkj.services.User_logService;
public class Fbs9100_sysparamImpl implements BaseDAO,CallBack{
@@ -33,6 +37,30 @@
"where dev_id=? ";
boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{sys.getIPADDR(),sys.getSubIPADDR(),sys.getNetGateADDR(),sys.getGroupVolRange(),sys.getGroupVolSorce(),sys.getCurrentRange(),sys.getCurrentTyte(),sys.getMonomerOrder(),sys.getBackLightTime()
,sys.getMACADDR(),sys.getLoaderCount(),sys.getDtCardCount(),sys.getPowerBreakChargeCurr(),sys.getMajorBattGroupNum(),sys.getPOF_BG_Boost_Cnt(),sys.getPOF_BG_Boost_VolStop(),sys.getPOF_BG_Boost_VolStart(),sys.getDev_id()});
+ return bl;
+ }
+ //鎵归噺璁剧疆绯荤粺鍙傛暟
+ public boolean updatePro(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="REPLACE into db_ram_db.tb_fbs9100_sysparam(dev_id,IPADDR,SubIPADDR,NetGateADDR,GroupVolRange,GroupVolSorce,CurrentRange,CurrentTyte,MonomerOrder,BackLightTime"
+ + ",MACADDR,LoaderCount,DtCardCount,PowerBreakChargeCurr,MajorBattGroupNum,POF_BG_Boost_Cnt,POF_BG_Boost_VolStop,POF_BG_Boost_VolStart) "
+ + " values()";
+ sql_str.add(sql);
+ {
+ 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;
}
//鏌ヨ绯荤粺鍙傛暟鍓�(濡傛灉娌℃湁榛樿鏁版嵁瑕佺敤REPLACE 娣诲姞涓�绗旀暟鎹�)
@@ -152,6 +180,40 @@
}
return res_exe;
}
+
+ //鎵归噺璁剧疆绯荤粺鍙傛暟鎴愬姛鍚庤鍙栧懡浠ょ殑ACK
+ public boolean getCmdAck(int cmd,int dev_id) {
+ int m_cmd = cmd;
+ int m_cmd_ack = cmd;
+ switch(m_cmd) {
+ case FBS9100_ComBase.CMD_GetSYSSetParam: m_cmd_ack = FBS9100_ComBase.CMD_GetSYSSetParamAck; break;
+ case FBS9100_ComBase.CMD_SetSYSSetParam: m_cmd_ack = FBS9100_ComBase.CMD_SetSYSSetParamAck; break;
+ default: return false;
+ }
+ String sql = "SELECT op_cmd FROM db_ram_db.tb_fbs9100_sysparam "+
+ " WHERE dev_id="+dev_id;
+ Connection conn=DBUtil.getConn();
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ boolean res_exe=false;
+ try {
+ ps = conn.prepareStatement(sql);
+ rs=ps.executeQuery();
+ if(rs.next())
+ {
+ if(rs.getInt("op_cmd") == m_cmd_ack)
+ {
+ res_exe = true;
+ }
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ DBUtil.close(rs, ps, conn);
+ return res_exe;
+ }
+
public List serchByInfo(Object obj) {
// TODO Auto-generated method stub
return null;
--
Gitblit v1.9.1