From 4337694caa2cf285e720664df591037cb3d2f809 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 13 十一月 2018 17:05:54 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/ram/Fbs9100s_dfu_stateService.java | 13 +++++++++++++
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java | 27 +++++++++++++++++++++++++--
gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java | 7 +++++++
3 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java
index 7167d70..f867a1e 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java
@@ -28,6 +28,13 @@
result=tojson(model);
return SUCCESS;
}
+ //鎵归噺鍗囩骇纭
+ public String updatePro(){
+ List<Fbs9100s_dfu_state> list=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Fbs9100s_dfu_state>>(){}.getType());
+ ServiceModel model=service.updatePro(list);
+ result=tojson(model);
+ return SUCCESS;
+ }
//鍗囩骇鐣岄潰瀹炴椂鍒锋柊
public String serchByCondition(){
List<Integer> list=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Integer>>(){}.getType());
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java
index 27a281b..99297e6 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java
@@ -8,8 +8,11 @@
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.CallBack;
import com.fgkj.dao.DAOHelper;
+import com.fgkj.dao.UinfDaoFactory;
import com.fgkj.db.DBUtil;
+import com.fgkj.dto.User_log;
import com.fgkj.dto.ram.Fbs9100s_dfu_state;
+import com.fgkj.services.User_logService;
public class Fbs9100s_dfu_stateImpl implements BaseDAO,CallBack{
@@ -27,11 +30,31 @@
//鍗囩骇纭
public boolean update(Object obj) {
Fbs9100s_dfu_state dfu=(Fbs9100s_dfu_state) obj;
- String sql="update db_ram_db.tb_fbs9100s_dfu_state set dfu_en=true,dfu_wr_stat=1, dfu_data_blocknum=1 where dev_id=?;";
+ String sql="update db_ram_db.tb_fbs9100s_dfu_state set dfu_en=true,dfu_wr_stat=1, dfu_data_blocknum=1 where dev_id=?";
boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{dfu.getDev_id()});
return bl;
}
-
+ //鎵归噺鍗囩骇纭
+ public boolean updatePro(Object obj) {
+ List<Fbs9100s_dfu_state> list=(List<Fbs9100s_dfu_state>) obj;
+ List<User_log> listU=new ArrayList<User_log>();//瀛樻斁user_log
+ ArrayList sql_str=new ArrayList();
+ if(list!=null&&list.size()>0){
+ for (int i = 0; i < list.size(); i++) {
+ Fbs9100s_dfu_state dfu=list.get(i);
+ String sql="update db_ram_db.tb_fbs9100s_dfu_state set dfu_en=true,dfu_wr_stat=1, dfu_data_blocknum=1 where dev_id="+dfu.getDev_id();
+ sql_str.add(sql);
+ {
+ String msg="鍗囩骇"+dfu.getDev_id()+"璁惧";
+ 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 del(Object obj) {
// TODO Auto-generated method stub
return false;
diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100s_dfu_stateService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100s_dfu_stateService.java
index 18c3366..4e322e7 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100s_dfu_stateService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100s_dfu_stateService.java
@@ -4,6 +4,7 @@
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.BaseDAOFactory;
+import com.fgkj.dao.impl.ram.Fbs9100s_dfu_stateImpl;
import com.fgkj.dto.ServiceModel;
public class Fbs9100s_dfu_stateService {
@@ -40,6 +41,18 @@
}
return model;
}
+ //鎵归噺鍗囩骇纭
+ public ServiceModel updatePro(Object obj) {
+ boolean bl=((Fbs9100s_dfu_stateImpl)dao).updatePro(obj);
+ if(bl){
+ model.setCode(1);
+ model.setMsg("鎵归噺鍗囩骇鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鎵归噺鍗囩骇澶辫触!");
+ }
+ return model;
+ }
//鍗囩骇鐣岄潰瀹炴椂鍒锋柊
public ServiceModel serchByCondition(Object obj) {
List list=dao.serchByCondition(obj);
--
Gitblit v1.9.1