update battInf# etc

whycrzg

2021-02-03 9948b3f9a8d2d471a608b169de946eeb7d08b4b5

 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);