From 72f6dd64e2250c793ccfb289dd523ef7fab4b2bf Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期二, 08 一月 2019 09:42:50 +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_battparamAction$2.class | 0
gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java | 39 +++++++++++++++++++
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.class | 0
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java | 23 +++++++++++
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl$1.class | 0
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java | 8 +++
8 files changed, 69 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$2.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$2.class
new file mode 100644
index 0000000..6273566
--- /dev/null
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$2.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class
index d644d5b..1d6ae03 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl$1.class
index 305b0d2..5d0daad 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.class
index 181c8cb..4081796 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class
index 08ac449..e035d2d 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class
Binary files differ
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
index 51964f2..f18aca6 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
@@ -60,7 +60,13 @@
return SUCCESS;
}
-
+ //鎵归噺璇诲彇鐢垫睜鍙傛暟
+ public String readPL() {
+ List<Fbs9100_battparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_battparam>>(){}.getType());
+ ServiceModel model = service.readPL(list);
+ result = tojson(model);
+ return SUCCESS;
+ }
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java
index be93542..0d53244 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java
@@ -75,6 +75,29 @@
(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
return bl;
}
+ //鎵归噺璇诲彇鐢垫睜鍙傛暟
+ public boolean readPL(Object obj) {
+ List<Fbs9100_battparam> list=(List<Fbs9100_battparam>) 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_battparam fs=list.get(i);
+ String sql="replace into db_ram_db.tb_fbs9100_battparam(dev_id,op_cmd) "
+ + " values("+fs.getDev_id()+","+fs.getOp_cmd()+")";
+ 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 del(Object obj) {
// TODO Auto-generated method stub
return false;
diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
index 5484e95..2a03418 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
@@ -161,6 +161,45 @@
}
return model;
}
+ //鎵归噺璇诲彇鐢垫睜鍙傛暟
+ public ServiceModel readPL(Object obj) {
+ boolean bl=((Fbs9100_battparamImpl)dao).readPL(obj);
+ if(bl) {
+ List<Fbs9100_battparam> list=(List<Fbs9100_battparam>) 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_battparam fs=new Fbs9100_battparam();
+ fs=list.get(i);
+ if(fs.getNum()==0) {//鍓嶅彴浼犲弬璁剧疆
+ boolean b=((Fbs9100_battparamImpl)dao).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 static void main(String[] args) {
Fbs9100_battparamService service=new Fbs9100_battparamService();
BattInf binf=new BattInf();
--
Gitblit v1.9.1