From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 9 deletions(-)
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 93c686a..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{
@@ -97,6 +98,52 @@
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;
+ }
+ //鎵归噺鏀剧數
+ public boolean updatePro_dis(Object obj) {
+ List<Fbs9100_setparam> list=(List<Fbs9100_setparam>) 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_setparam fs=list.get(i);
+ String sql="UPDATE db_ram_db.tb_fbs9100_setparam SET "
+ + " op_cmd="+fs.getOp_cmd()+ ",TestCmd="+fs.getTestCmd()+ " 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);
+ }
+ }
+ }
+
+ 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);
}
@@ -346,17 +393,17 @@
try {
ps = conn.prepareStatement(sql);
rs=ps.executeQuery();
- if(rs.next())
+ if(rs.next())
+ {
+ if(rs.getInt("op_cmd") == m_cmd_ack)
{
- if(rs.getInt("op_cmd") == m_cmd_ack)
- {
- res_exe = true;
- }
- }
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ res_exe = true;
+ }
}
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
DBUtil.close(rs, ps, conn);
return res_exe;
}
--
Gitblit v1.9.1