From f55c99f2cb7a8c928c52fb8f8f68273c56f659cc Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 21 十二月 2018 14:42:36 +0800
Subject: [PATCH] 审核添加和修改
---
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$4.class | 0
gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java | 9 ++++
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batt_rtstateDAOImpl.class | 0
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 30 ++++++++++++++
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$2.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$5.class | 0
gx_tieta/src/com/fgkj/services/Battinf_applyService.java | 14 ++++++
gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java | 2
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 36 +++++++++++++++++-
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$1.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/BattinfGroupFactory.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class | 0
gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java | 19 +++++++--
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$3.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/Battinf_applyService.class | 0
20 files changed, 100 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction.class
index c48024f..540a4f3 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Battinf_applyAction.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/BattinfGroupFactory.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/BattinfGroupFactory.class
index af34b7e..ad45915 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/BattinfGroupFactory.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/BattinfGroupFactory.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class
index 1ee853a..50d3f55 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batt_rtstateDAOImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batt_rtstateDAOImpl.class
index 1a17e3d..c74852f 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batt_rtstateDAOImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batt_rtstateDAOImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$1.class
index a39a154..02f583f 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$2.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$2.class
index ca3ed2e..7a48da8 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$2.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$2.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$3.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$3.class
index 8373697..30f21f8 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$3.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$3.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$4.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$4.class
index aa6c501..381fc65 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$4.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$4.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$5.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$5.class
index eb0e6cb..99cb85f 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$5.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$5.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class
index fdbfc51..6644bb2 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$6.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class
index 20ad946..b59788f 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$7.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class
index 0e66735..03fad08 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl$8.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class
index d20a843..c836138 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Battinf_applyImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/Battinf_applyService.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/Battinf_applyService.class
index af435e2..f85dc95 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/Battinf_applyService.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/Battinf_applyService.class
Binary files differ
diff --git a/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java b/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
index 3aceee1..82b803b 100644
--- a/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
@@ -45,13 +45,20 @@
result=tojson(model);
return SUCCESS;
}
- //娣诲姞鐢宠
+ //娣诲姞鐢宠(鏂板缓)
public String add(){
List<Battinf_apply> list=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Battinf_apply>>(){}.getType() );
ServiceModel model=service.add(list);
result=tojson(model);
return SUCCESS;
}
+ //娣诲姞鐢宠(淇敼鏃х殑)
+ public String addPro(){
+ List<Battinf_apply> list=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Battinf_apply>>(){}.getType() );
+ ServiceModel model=service.addPro(list);
+ result=tojson(model);
+ return SUCCESS;
+ }
//鏌ヨ鍑烘墍鏈夐渶瑕佺‘璁ょ殑鐢宠
public String serchByCondition(){
Battinf_apply bapply=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Battinf_apply.class);
diff --git a/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java b/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
index 87a204a..e1066eb 100644
--- a/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
@@ -110,14 +110,25 @@
//鏌ヨ褰撳墠鏈�澶х殑鐢垫睜缁刬d
public static int searchMaxBattgroupId(){
int battgroupid=0;
- int BattgroupId_inf=(new Batt_rtstateDAOImpl()).searchMaxBattgroupId();//褰撳墠鍐呭瓨涓渶澶х殑鐢垫睜缁刬d
+ int BattgroupId_rtstate=(new Batt_rtstateDAOImpl()).searchMaxBattgroupId();//褰撳墠鍐呭瓨涓渶澶х殑鐢垫睜缁刬d
int BattgroupId_apply=(new Battinf_applyImpl()).searchMaxBattgroupId_apply();//褰撳墠鍐呭瓨涓渶澶х殑鐢垫睜缁刬d
+ int BattgroupId_inf=(new BattInfImpl()).searchMaxBattgroupId();//褰撳墠鍐呭瓨涓渶澶х殑鐢垫睜缁刬d
if(BattgroupId_inf>=BattgroupId_apply){
- battgroupid=BattgroupId_inf+1;
+ battgroupid=BattgroupId_inf;
+ if(battgroupid>=BattgroupId_rtstate) {
+ battgroupid=battgroupid;
+ }else {
+ battgroupid=BattgroupId_rtstate;
+ }
}else{
- battgroupid=BattgroupId_apply+1;
+ battgroupid=BattgroupId_apply;
+ if(battgroupid>=BattgroupId_rtstate) {
+ battgroupid=battgroupid;
+ }else {
+ battgroupid=BattgroupId_rtstate;
+ }
}
- return battgroupid;
+ return battgroupid+1;
}
//鏌ヨ褰撳墠鏈�澶х殑stationid
public static int searchStationId(){
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 8bdfe54..067fa8a 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -4344,7 +4344,35 @@
});
return list;
}
-
+ //鏌ヨbattinf涓渶澶х殑battgroupid
+ //鏌ヨ鍑哄綋鍓嶅瓨鍦ㄥ唴瀛樹腑鏈�澶х殑鐢垫睜缁刬d(寰堥噸瑕�**********)
+ public int searchMaxBattgroupId(){
+ String sql=" select max(battgroupId) as id from db_battinf.tb_battinf limit 1";
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ int battgroupid=1010000;
+ if(rs.getString("id")!=null){
+ battgroupid=rs.getInt("id");
+ }
+ list.add(battgroupid);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ int battgroupid=0;
+ if(list!=null&&list.size()>0){
+ battgroupid=(Integer) list.get(list.size()-1);
+ }
+ return battgroupid;
+ }
public static void main(String[] args) throws ParseException {
//new BattInfImpl().searchAll();
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
index a969e45..55d807f 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
@@ -752,7 +752,7 @@
//鏌ヨ鍑哄綋鍓嶅瓨鍦ㄥ唴瀛樹腑鏈�澶х殑鐢垫睜缁刬d(寰堥噸瑕�**********)
public int searchMaxBattgroupId(){
- String sql=" select max(battgroupId) as id from db_battinf.tb_battinf limit 1";
+ String sql=" select max(battgroupId) as id from db_ram_db.tb_batt_rtstate limit 1";
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() {
public List getResults(ResultSet rs) {
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 1887d90..c55a44a 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -33,7 +33,7 @@
// TODO Auto-generated method stub
return null;
}
- //娣诲姞鐢宠
+ //娣诲姞鐢宠(鏂板缓)
public boolean add(Object obj) {
List<Battinf_apply> list=(List<Battinf_apply>) obj;
List<User_log> listU=new ArrayList<User_log>();//瀛樻斁user_log
@@ -83,6 +83,38 @@
return bl;
}
+ //娣诲姞鐢宠(淇敼鏃х殑)
+ public boolean addPro(Object obj) {
+ List<Battinf_apply> list=(List<Battinf_apply>) obj;
+ List<User_log> listU=new ArrayList<User_log>();//瀛樻斁user_log
+ ArrayList<String> sql_str=new ArrayList();
+ if(list!=null && list.size()>0){
+ for (int i = 0; i < list.size(); i++) {
+ Battinf_apply bapply=list.get(i);
+ int uid=((User_inf)ActionUtil.getUser()).getUId();
+ bapply.setApply_uid(uid);
+ BattInf binf=bapply.getBinf();
+ String sql = "insert into db_battinf.tb_battinf_apply(" +
+ "apply_uid,apply_date,StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp,FbsDeviceIp_YM,FbsDeviceIp_WG,"
+ + "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
+ ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,install_user,DisCurrMax,station_phone" +
+ ") values("+bapply.getApply_uid()+",'"+DAOHelper.sdf.format(bapply.getApply_date())+"','"+binf.getStationId()+"','"+binf.getStationName()+"','"+binf.getStationName1()+"','"+binf.getStationName2()+"','"+binf.getStationName3()+"','"+binf.getStationName4()+"','"+binf.getStationName5()+
+ "','"+binf.getStationIp()+"',"+binf.getFBSDeviceId()+",'"+binf.getFbsDeviceIp()+"','"+binf.getFbsDeviceIp_YM()+"','"+binf.getFbsDeviceIp_WG()+"','"+binf.getFBSDeviceName()+"',"+binf.getGroupIndexInFBSDevice()+
+ ","+binf.getBattGroupId()+","+binf.getBattGroupNum()+",'"+binf.getBattGroupName()+"',"+binf.getFloatVolLevel()+","+binf.getOfflineVolLevel()+","+binf.getBattFloatCurrent()+
+ ","+binf.getMonCount()+","+binf.getMonCapStd()+","+binf.getMonVolStd()+","+binf.getMonResStd()+","+binf.getMonSerStd()+","+binf.getMonVolLowToAvg()+
+ ",'"+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()+"')";
+ sql_str.add(sql);
+ {
+ String msg=((User_inf)ActionUtil.getUser()).getUId()+"鐢宠娣诲姞"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
+ listU.add(ulog);
+ }
+ }
+ }
+ Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+ (new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ return bl;
+ }
//纭鐢宠(澶氭潯)
public boolean update(Object obj) {
List<Battinf_apply> list=(List<Battinf_apply>) obj;
@@ -96,7 +128,7 @@
binf.setStation_install(1);
String sql_update_apply=" update db_battinf.tb_battinf_apply set confrim_uid="+bapply.getConfrim_uid()+",apply_en=1 where battgroupid="+binf.getBattGroupId();
sql_str.add(sql_update_apply);
- String sql_insert_binf="insert into db_battinf.tb_battinf(" +
+ String sql_insert_binf="replace into db_battinf.tb_battinf(" +
"StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp,FbsDeviceIp_YM,FbsDeviceIp_WG,"
+ "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,install_user,DisCurrMax,station_phone,Station_install" +
diff --git a/gx_tieta/src/com/fgkj/services/Battinf_applyService.java b/gx_tieta/src/com/fgkj/services/Battinf_applyService.java
index 9f85034..47723fe 100644
--- a/gx_tieta/src/com/fgkj/services/Battinf_applyService.java
+++ b/gx_tieta/src/com/fgkj/services/Battinf_applyService.java
@@ -64,7 +64,7 @@
}
return model;
}
- //娣诲姞鐢宠
+ //娣诲姞鐢宠(鏂板缓)
public ServiceModel add(Object obj){
boolean bl=dao.add(obj);
if(bl){
@@ -76,6 +76,18 @@
}
return model;
}
+ //娣诲姞鐢宠(淇敼鏃х殑)
+ public ServiceModel addPro(Object obj){
+ boolean bl=((Battinf_applyImpl)dao).addPro(obj);
+ if(bl){
+ model.setCode(1);
+ model.setMsg("娣诲姞鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("娣诲姞澶辫触!");
+ }
+ return model;
+ }
//鏌ヨ鍑哄鏍稿畬鐨勭敵璇峰拰寰呭鏍哥殑鐢宠
public ServiceModel serchByInfo(Object obj){
List list=dao.serchByInfo(obj);
--
Gitblit v1.9.1