From 9948b3f9a8d2d471a608b169de946eeb7d08b4b5 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期三, 03 二月 2021 15:46:38 +0800
Subject: [PATCH] update battInf# etc
---
src/main/java/com/fgkj/services/Battalarm_dataService.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/fgkj/services/Battalarm_dataService.java b/src/main/java/com/fgkj/services/Battalarm_dataService.java
index 691013c..bb562d2 100644
--- a/src/main/java/com/fgkj/services/Battalarm_dataService.java
+++ b/src/main/java/com/fgkj/services/Battalarm_dataService.java
@@ -43,7 +43,7 @@
TransactionDefinition transactionDefinition;
public ServiceModel add(Object obj) {
-
+
Boolean bl=mapper.add(obj);
if(bl){
model.setCode(1);
@@ -90,8 +90,14 @@
if (!bl) {
continue;
}
- if (!(mapper.updatePro(adata)>0)){
- bl = false;
+ try {
+ bl = mapper.updatePro(adata)>0;
+ } catch (Exception e) {
+ e.printStackTrace();
+ dataSourceTransactionManager.rollback(transactionStatus);
+ model.setCode(0);
+ model.setMsg("纭澶辫触!");
+ return model;
}
{ //鏈烘埧鍜岀數姹犵粍鍚嶇О //鍛婅鐨勭被鍨�
String msg = "纭" + adata.getStationname() + "鐨�" + adata.getNote() + "鍛婅";
@@ -146,7 +152,7 @@
// 3.1鐢垫睜瀹归噺鍛婅瀹炴椂鏌ヨ
public ServiceModel serchCapAlarm(Batt_Maint_Dealarm obj){
- model=new ServiceModel();
+ ServiceModel model=new ServiceModel();
List<Batt_Maint_Dealarm> list=mapper.serchByCondition(obj);
String name="鏈煡";//瀛樻斁鍛婅鍚嶇О
String type="鏈煡";//瀛樻斁鍛婅绛夌骇
@@ -224,7 +230,7 @@
type=AlarmDaoFactory.getAlarmType(adata.getAlm_level());
list.get(i).getBinf().setStationName8(name);
list.get(i).getBinf().setStationName9(type);
- System.out.println("StationName9 = " + list.get(i).getBinf().getStationName9());
+// System.out.println("StationName9 = " + list.get(i).getBinf().getStationName9());
}
PageInfo<Batt_Maint_Dealarm> pageInfo = new PageInfo<>(list);
model.setCode(1);
@@ -335,7 +341,7 @@
ServiceModelOnce model = new ServiceModelOnce();
List<Battalarm_data> list=mapper.serchRealTime(obj);
if(list.size()>0&&list!=null){
- System.out.println("list.get(0) = " + list.get(0));
+// System.out.println("list.get(0) = " + list.get(0));
model.setCode(1);
model.setSum(list.get(0).getNum());
}else{
@@ -419,8 +425,14 @@
if (!bl) {
continue;
}
- if (!(mapper.cancelalarmPro(adata)>0)) {
- bl = false;
+ try {
+ bl = mapper.cancelalarmPro(adata) > 0;
+ } catch (Exception e) {
+ e.printStackTrace();
+ dataSourceTransactionManager.rollback(transactionStatus);
+ model.setCode(0);
+ model.setMsg("鍙栨秷澶辫触!");
+ return model;
}
String msg = "鍙栨秷" + adata.getStationname() + "鐨�" + adata.getNote() + "鍛婅";
User_log ulog = UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
--
Gitblit v1.9.1