From 5eafdec8ecb2226f2077e8ae1138ee0d7d1aae7d Mon Sep 17 00:00:00 2001
From: 军 <军@hp-pc>
Date: 星期二, 09 十月 2018 14:29:58 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dto/BattInf_Rebuild.java | 144 ++++++++++++++++++++++++++++++++++++
gx_tieta/src/com/fgkj/db/DBUtil.java | 4
gx_tieta/src/com/fgkj/dao/impl/BattInf_RebuildImpl.java | 53 +++++++++++++
gx_tieta/src/com/fgkj/services/BattInfServices.java | 20 +++--
4 files changed, 211 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInf_RebuildImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInf_RebuildImpl.java
new file mode 100644
index 0000000..c2c9dc1
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInf_RebuildImpl.java
@@ -0,0 +1,53 @@
+package com.fgkj.dao.impl;
+
+import java.sql.ResultSet;
+import java.util.List;
+
+import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.CallBack;
+import com.fgkj.dao.DAOHelper;
+import com.fgkj.db.DBUtil;
+import com.fgkj.dto.BattInf_Rebuild;
+
+public class BattInf_RebuildImpl implements BaseDAO,CallBack{
+
+ public List getResults(ResultSet rs) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean add(Object obj) {
+ BattInf_Rebuild br=(BattInf_Rebuild) obj;
+ String sql="insert into db_battinf.tb_battinf_rebuild(old_stationname,old_battgroupname,old_battproducer,old_stationid,old_battgroupid,old_monum,new_stationname,new_battgroupname,new_battproducer,new_stationid,new_battgroupid,new_monum,rebuild_time,rebuild_uid,rebuild_address,rebuild_clear_type) " +
+ "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+ boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{br.getOld_stationname(),br.getOld_battgroupname(),br.getOld_battproducer(),br.getOld_stationid(),br.getOld_battgroupid(),br.getOld_monum(),
+ br.getNew_stationname(),br.getNew_battgroupname(),br.getNew_battproducer(),br.getNew_stationid(),br.getNew_battgroupid(),br.getNew_monum(),br.getRebuild_time(),br.getRebuild_uid(),br.getRebuild_address(),br.getRebuild_clear_type()});
+ return bl;
+ }
+
+ public boolean update(Object obj) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public boolean del(Object obj) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public List searchAll() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List serchByCondition(Object obj) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List serchByInfo(Object obj) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
diff --git a/gx_tieta/src/com/fgkj/db/DBUtil.java b/gx_tieta/src/com/fgkj/db/DBUtil.java
index 633017e..8ebd76d 100644
--- a/gx_tieta/src/com/fgkj/db/DBUtil.java
+++ b/gx_tieta/src/com/fgkj/db/DBUtil.java
@@ -20,8 +20,8 @@
private static String password="lmx8688139";
//private static String url="jdbc:mysql://118.89.139.230:3360/db_user";
//private static String url="jdbc:mysql://123.207.82.239:3360/db_user";
- private static String url="jdbc:mysql://192.168.0.34:3360/db_user";
- //private static String url="jdbc:mysql://127.0.0.1:3360/db_user";
+ //private static String url="jdbc:mysql://192.168.0.34:3360/db_user";
+ private static String url="jdbc:mysql://127.0.0.1:3360/db_user";
/*private static String username="root";
private static String password="123456";*/
diff --git a/gx_tieta/src/com/fgkj/dto/BattInf_Rebuild.java b/gx_tieta/src/com/fgkj/dto/BattInf_Rebuild.java
new file mode 100644
index 0000000..04d3f18
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/dto/BattInf_Rebuild.java
@@ -0,0 +1,144 @@
+package com.fgkj.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class BattInf_Rebuild implements Serializable{
+ private int num ;
+ private String old_stationname ;
+ private String old_battgroupname ;
+ private String old_battproducer ;
+ private String old_stationid ;
+ private int old_battgroupid ;
+ private int old_monum ;
+ private String new_stationname ;
+ private String new_battgroupname ;
+ private String new_battproducer ;
+ private String new_stationid ;
+ private int new_battgroupid ;
+ private int new_monum ;
+ private Date rebuild_time;
+ private int rebuild_uid ;
+ private String rebuild_address ;
+ private int rebuild_clear_type;
+ public int getNum() {
+ return num;
+ }
+ public void setNum(int num) {
+ this.num = num;
+ }
+ public String getOld_stationname() {
+ return old_stationname;
+ }
+ public void setOld_stationname(String old_stationname) {
+ this.old_stationname = old_stationname;
+ }
+ public String getOld_battgroupname() {
+ return old_battgroupname;
+ }
+ public void setOld_battgroupname(String old_battgroupname) {
+ this.old_battgroupname = old_battgroupname;
+ }
+ public String getOld_battproducer() {
+ return old_battproducer;
+ }
+ public void setOld_battproducer(String old_battproducer) {
+ this.old_battproducer = old_battproducer;
+ }
+ public String getOld_stationid() {
+ return old_stationid;
+ }
+ public void setOld_stationid(String old_stationid) {
+ this.old_stationid = old_stationid;
+ }
+ public int getOld_battgroupid() {
+ return old_battgroupid;
+ }
+ public void setOld_battgroupid(int old_battgroupid) {
+ this.old_battgroupid = old_battgroupid;
+ }
+ public int getOld_monum() {
+ return old_monum;
+ }
+ public void setOld_monum(int old_monum) {
+ this.old_monum = old_monum;
+ }
+ public String getNew_stationname() {
+ return new_stationname;
+ }
+ public void setNew_stationname(String new_stationname) {
+ this.new_stationname = new_stationname;
+ }
+ public String getNew_battgroupname() {
+ return new_battgroupname;
+ }
+ public void setNew_battgroupname(String new_battgroupname) {
+ this.new_battgroupname = new_battgroupname;
+ }
+ public String getNew_battproducer() {
+ return new_battproducer;
+ }
+ public void setNew_battproducer(String new_battproducer) {
+ this.new_battproducer = new_battproducer;
+ }
+ public String getNew_stationid() {
+ return new_stationid;
+ }
+ public void setNew_stationid(String new_stationid) {
+ this.new_stationid = new_stationid;
+ }
+ public int getNew_battgroupid() {
+ return new_battgroupid;
+ }
+ public void setNew_battgroupid(int new_battgroupid) {
+ this.new_battgroupid = new_battgroupid;
+ }
+ public int getNew_monum() {
+ return new_monum;
+ }
+ public void setNew_monum(int new_monum) {
+ this.new_monum = new_monum;
+ }
+ public Date getRebuild_time() {
+ return rebuild_time;
+ }
+ public void setRebuild_time(Date rebuild_time) {
+ this.rebuild_time = rebuild_time;
+ }
+ public int getRebuild_uid() {
+ return rebuild_uid;
+ }
+ public void setRebuild_uid(int rebuild_uid) {
+ this.rebuild_uid = rebuild_uid;
+ }
+ public String getRebuild_address() {
+ return rebuild_address;
+ }
+ public void setRebuild_address(String rebuild_address) {
+ this.rebuild_address = rebuild_address;
+ }
+ public int getRebuild_clear_type() {
+ return rebuild_clear_type;
+ }
+ public void setRebuild_clear_type(int rebuild_clear_type) {
+ this.rebuild_clear_type = rebuild_clear_type;
+ }
+ @Override
+ public String toString() {
+ return "BattInf_Rebuild [num=" + num + ", old_stationname="
+ + old_stationname + ", old_battgroupname=" + old_battgroupname
+ + ", old_battproducer=" + old_battproducer + ", old_stationid="
+ + old_stationid + ", old_battgroupid=" + old_battgroupid
+ + ", old_monum=" + old_monum + ", new_stationname="
+ + new_stationname + ", new_battgroupname=" + new_battgroupname
+ + ", new_battproducer=" + new_battproducer + ", new_stationid="
+ + new_stationid + ", new_battgroupid=" + new_battgroupid
+ + ", new_monum=" + new_monum + ", rebuild_time=" + rebuild_time
+ + ", rebuild_uid=" + rebuild_uid + ", rebuild_address="
+ + rebuild_address + ", rebuild_clear_type="
+ + rebuild_clear_type + "]";
+ }
+
+
+
+}
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 9561969..7355e79 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -50,9 +50,10 @@
Process_survey process=new Process_survey();
process.setProcessName(ProcessServerDao.BMS_FBSDEV);
Boolean b=(new Process_surveyImpl()).update(process);*/
- App_Sys as=new App_Sys();
+ /*App_Sys as=new App_Sys();
as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN);
- Boolean b=(new App_SysImpl()).update(as);
+ Boolean b=(new App_SysImpl()).update(as);*/
+ BattTestData.run_cmd();
model.setCode(1);
model.setMsg("娣诲姞鎴愬姛!");
}
@@ -71,9 +72,10 @@
Process_survey process=new Process_survey();
process.setProcessName(ProcessServerDao.BMS_FBSDEV);
Boolean b=(new Process_surveyImpl()).update(process);*/
- App_Sys as=new App_Sys();
+ /*App_Sys as=new App_Sys();
as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN);
- Boolean b=(new App_SysImpl()).update(as);
+ Boolean b=(new App_SysImpl()).update(as);*/
+ BattTestData.run_cmd();
model.setCode(1);
model.setMsg("淇敼鎴愬姛!");
}
@@ -122,9 +124,10 @@
Process_survey process=new Process_survey();
process.setProcessName(ProcessServerDao.BMS_FBSDEV);
Boolean b=(new Process_surveyImpl()).update(process);*/
- App_Sys as=new App_Sys();
+ /*App_Sys as=new App_Sys();
as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN);
- Boolean b=(new App_SysImpl()).update(as);
+ Boolean b=(new App_SysImpl()).update(as);*/
+ BattTestData.run_cmd();
model.setCode(1);
model.setMsg("鍒犻櫎鎴愬姛!");
}
@@ -828,13 +831,14 @@
//bs.searchInform(bmd);
//bs.serchByBattGroupName(b);
//bs.updateIp(b);
- ServiceModel model=bs.serchMakeGroup(b);
+ /*ServiceModel model=bs.serchMakeGroup(b);
List<BattInf> list=(List) model.getData();
for (BattInf binf : list) {
List<Batttestdatastop> list_sdata=(List) binf.getObj();
for (Batttestdatastop s : list_sdata) {
System.out.println(s);
}
- }
+ }*/
+ //BattTestData.run_cmd(BattTestData.STRCMD);
}
}
--
Gitblit v1.9.1