81041
2019-11-28 f1659f2d95d2c3d2ac4126a9ed88c870df9a2a2e
电池告警功能和告警参数设置添加
4个文件已添加
3个文件已修改
328 ■■■■■ 已修改文件
platforms/android/app/src/main/java/com/fgkj/dao/BaseDAO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/java/com/fgkj/dao/BaseDAOFactory.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/java/com/fgkj/dto/Alarm_param.java 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/java/com/fgkj/impl/Alarm_paramImpl.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/java/com/fgkj/impl/Battalram_dataImpl.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/java/com/fgkj/service/Alarm_paramService.java 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/java/com/fgkj/service/Battalram_dataService.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/java/com/fgkj/dao/BaseDAO.java
@@ -11,6 +11,8 @@
    public static final int BATTTESTDATA=3;
    public static final int BATTRESDATA=4;
    public static final int BATTRESDATA_INF=5;
    public static final int BATTALRAM_DATA=6;
    public static final int ALARM_PARAM=7;
    public boolean add(SQLiteDatabase db, Object obj); // 添加
platforms/android/app/src/main/java/com/fgkj/dao/BaseDAOFactory.java
@@ -1,6 +1,8 @@
package com.fgkj.dao;
import com.fgkj.impl.Alarm_paramImpl;
import com.fgkj.impl.Battalram_dataImpl;
import com.fgkj.impl.BattinfImpl;
import com.fgkj.impl.BattresdataImpl;
import com.fgkj.impl.Battresdata_infImpl;
@@ -19,6 +21,8 @@
            case 3:return new BatttestdataDAOImpl();
            case 4:return new BattresdataImpl();
            case 5:return new Battresdata_infImpl();
            case 6:return new Battalram_dataImpl();
            case 7:return new Alarm_paramImpl();
            default :return null;
        }
    }
platforms/android/app/src/main/java/com/fgkj/dto/Alarm_param.java
New file
@@ -0,0 +1,82 @@
package com.fgkj.dto;
import java.io.Serializable;
public class Alarm_param implements Serializable {
    private int num;
    private int alm_id;
    private String alm_name;
    private double alm_high_coe;
    private double alm_low_coe;
    private double alm_high_en;
    private int alm_low_en;
    public int getNum() {
        return num;
    }
    public void setNum(int num) {
        this.num = num;
    }
    public int getAlm_id() {
        return alm_id;
    }
    public void setAlm_id(int alm_id) {
        this.alm_id = alm_id;
    }
    public String getAlm_name() {
        return alm_name;
    }
    public void setAlm_name(String alm_name) {
        this.alm_name = alm_name;
    }
    public double getAlm_high_coe() {
        return alm_high_coe;
    }
    public void setAlm_high_coe(double alm_high_coe) {
        this.alm_high_coe = alm_high_coe;
    }
    public double getAlm_low_coe() {
        return alm_low_coe;
    }
    public void setAlm_low_coe(double alm_low_coe) {
        this.alm_low_coe = alm_low_coe;
    }
    public double getAlm_high_en() {
        return alm_high_en;
    }
    public void setAlm_high_en(double alm_high_en) {
        this.alm_high_en = alm_high_en;
    }
    public int getAlm_low_en() {
        return alm_low_en;
    }
    public void setAlm_low_en(int alm_low_en) {
        this.alm_low_en = alm_low_en;
    }
    @Override
    public String toString() {
        return "Alarm_param{" +
                "num=" + num +
                ", alm_id=" + alm_id +
                ", alm_name='" + alm_name + '\'' +
                ", alm_high_coe=" + alm_high_coe +
                ", alm_low_coe=" + alm_low_coe +
                ", alm_high_en=" + alm_high_en +
                ", alm_low_en=" + alm_low_en +
                '}';
    }
}
platforms/android/app/src/main/java/com/fgkj/impl/Alarm_paramImpl.java
New file
@@ -0,0 +1,86 @@
package com.fgkj.impl;
import android.content.ContentValues;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import com.fgkj.dao.ActionUtil;
import com.fgkj.dao.BaseDAO;
import com.fgkj.dto.Alarm_param;
import com.fgkj.dto.Batttestdata_inf;
import java.util.ArrayList;
import java.util.List;
public class Alarm_paramImpl implements BaseDAO {
    @Override
    public boolean add(SQLiteDatabase db, Object obj) {
        return false;
    }
    //修改参数根据alm——id
    @Override
    public boolean update(SQLiteDatabase db, Object obj) {
        boolean bl=false;
        Alarm_param aparam=(Alarm_param)obj;
        ContentValues cv=Alarm_paramImpl.getContentValues(obj);
        String sql="alm_id=?";
        long row=db.update("tb_alarm_param",cv,sql,new String[]{String.valueOf(aparam.getAlm_id())});
        if(row>0){
            bl=true;
        }else{
            bl=false;
        }
        return  bl;
    }
    @Override
    public boolean del(SQLiteDatabase db, Object obj) {
        return false;
    }
    //查询告警参数
    @Override
    public List searchAll(SQLiteDatabase db) {
        String sql="select * from tb_alarm_param ";
        Cursor rs=db.rawQuery(sql,null);
        List list=new ArrayList();
        try {
            while (rs.moveToNext()){
                Alarm_param aparam=new Alarm_param();
                aparam.setNum(rs.getInt(rs.getColumnIndex("num")));
                aparam.setAlm_id(rs.getInt(rs.getColumnIndex("alm_id")));
                aparam.setAlm_name(rs.getString(rs.getColumnIndex("alm_name")));
                aparam.setAlm_high_coe(rs.getDouble(rs.getColumnIndex("alm_high_coe")));
                aparam.setAlm_low_coe(rs.getDouble(rs.getColumnIndex("alm_low_coe")));
                aparam.setAlm_high_en(rs.getInt(rs.getColumnIndex("alm_high_en")));
                aparam.setAlm_low_en(rs.getInt(rs.getColumnIndex("alm_low_en")));
                list.add(aparam);
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
        return null;
    }
    @Override
    public List serchByCondition(SQLiteDatabase db, Object obj) {
        return null;
    }
    @Override
    public List serchByInfo(SQLiteDatabase db, Object obj) {
        return null;
    }
    //获取ContentValues
    public static ContentValues getContentValues(Object obj){
        Alarm_param aparam=(Alarm_param)obj;
        ContentValues cv=new ContentValues();
        cv.put("num",aparam.getNum());
        cv.put("alm_id",aparam.getAlm_id());
        cv.put("alm_name",aparam.getAlm_name());
        cv.put("alm_high_coe",aparam.getAlm_high_coe());
        cv.put("alm_low_coe",aparam.getAlm_low_coe());
        cv.put("alm_high_en",aparam.getAlm_high_en());
        cv.put("alm_low_en",aparam.getAlm_low_en());
        return  cv;
    }
}
platforms/android/app/src/main/java/com/fgkj/impl/Battalram_dataImpl.java
@@ -1,9 +1,14 @@
package com.fgkj.impl;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import com.fgkj.dao.ActionUtil;
import com.fgkj.dao.BaseDAO;
import com.fgkj.dto.Battalram_data;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
public class Battalram_dataImpl implements BaseDAO{
@@ -22,17 +27,50 @@
    public boolean del(SQLiteDatabase db, Object obj) {
        return false;
    }
    @Override
    public List searchAll(SQLiteDatabase db) {
        return null;
    }
    //查询所有实时或者历史告警数据,全部传100
    @Override
    public List serchByCondition(SQLiteDatabase db, Object obj) {
        return null;
        Battalram_data adata=(Battalram_data)obj;
        String sql=" select * from tb_battalram_data where ";
        //告警类型
        String typeSqlT="alm_cleared_type!=?";
        String typeSqlF="alm_cleared_type=?";
        if(adata.getAlm_cleared_type()==100){
            sql+=typeSqlT;
        }else{
            sql+=typeSqlF;
        }
        //排序
        String endSql="order by alm_start_time desc  ";
        sql+=endSql;
        List list=new ArrayList();
        Cursor rs=db.rawQuery(sql,new String[]{String.valueOf(adata.getAlm_cleared_type())});
        try {
            while (rs.moveToNext()){
                Battalram_data a=new Battalram_data();
                a.setNum(rs.getInt(rs.getColumnIndex("num")));
                a.setBattGroupId(rs.getInt(rs.getColumnIndex("BattGroupId")));
                a.setMonNum(rs.getInt(rs.getColumnIndex("MonNum")));
                a.setAlm_id(rs.getInt(rs.getColumnIndex("alm_id")));
                a.setAlm_signal_id(rs.getInt(rs.getColumnIndex("alm_signal_id")));
                a.setAlm_start_time(ActionUtil.sdf.parse(rs.getString(rs.getColumnIndex("alm_start_time"))));
                a.setAlm_end_time(ActionUtil.sdf.parse(rs.getString(rs.getColumnIndex("alm_end_time"))));
                a.setAlm_value(rs.getDouble(rs.getColumnIndex("alm_value")));
                a.setAlm_is_confirmed(rs.getInt(rs.getColumnIndex("alm_is_confirmed")));
                a.setAlm_confirmed_time(ActionUtil.sdf.parse(rs.getString(rs.getColumnIndex("alm_confirmed_time"))));
                a.setAlm_cleared_type(rs.getInt(rs.getColumnIndex("alm_cleared_type")));
                list.add(a);
            }
        } catch (ParseException e) {
            e.printStackTrace();
        }
        return list;
    }
    @Override
    public List serchByInfo(SQLiteDatabase db, Object obj) {
        return null;
platforms/android/app/src/main/java/com/fgkj/service/Alarm_paramService.java
New file
@@ -0,0 +1,62 @@
package com.fgkj.service;
import android.database.sqlite.SQLiteDatabase;
import android.webkit.JavascriptInterface;
import android.webkit.WebView;
import com.fgkj.action.ServiceModel;
import com.fgkj.dao.ActionUtil;
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.BaseDAOFactory;
import com.fgkj.dao.DBHelper;
import com.fgkj.dto.Alarm_param;
import com.fgkj.dto.Battalram_data;
import java.util.List;
public class Alarm_paramService {
    private BaseDAO dao;
    private ServiceModel model;
    private WebView webView;
    public static final String ALARM_PARAMSERVICE_NAME = "Alarm_paramService";//JS调用类名
    private DBHelper dbHelper;
    public Alarm_paramService(WebView webView, DBHelper dbHelper) {
        this.dao= BaseDAOFactory.getBaseDAO(BaseDAO.ALARM_PARAM);
        this.model=new ServiceModel();
        this.webView = webView;
        this.dbHelper = dbHelper;
    }
    //查询告警参数
    @JavascriptInterface
    public  void  searchAll(String obj) {
        SQLiteDatabase db=dbHelper.getWritableDatabase();
        List list=dao.searchAll(db);
        if(list!=null&&list.size()>0){
            model.code=1;
            model.data=list;
            model.msg="查询成功";
        }else{
            model.code=0;
            model.msg="查询失败";
        }
        db.close();
        ActionUtil.SendCallDataToJS(ALARM_PARAMSERVICE_NAME,"searchAll",model,webView,ActionUtil.getGson("yyyy-MM-dd HH:mm:ss"));
    }
    //修改参数根据alm——id
    @JavascriptInterface
    public  void  update(String obj) {
        SQLiteDatabase db=dbHelper.getWritableDatabase();
        Alarm_param aparam= ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(obj,Alarm_param.class);
        boolean bl=dao.update(db,aparam);
        if(bl){
            model.code=1;
            model.msg="修改成功";
        }else{
            model.code=0;
            model.msg="修改失败";
        }
        db.close();
        ActionUtil.SendCallDataToJS(ALARM_PARAMSERVICE_NAME,"update",model,webView,ActionUtil.getGson("yyyy-MM-dd HH:mm:ss"));
    }
}
platforms/android/app/src/main/java/com/fgkj/service/Battalram_dataService.java
New file
@@ -0,0 +1,46 @@
package com.fgkj.service;
import android.database.sqlite.SQLiteDatabase;
import android.webkit.JavascriptInterface;
import android.webkit.WebView;
import com.fgkj.action.ServiceModel;
import com.fgkj.dao.ActionUtil;
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.BaseDAOFactory;
import com.fgkj.dao.DBHelper;
import com.fgkj.dto.Battalram_data;
import java.util.List;
public class Battalram_dataService {
    private BaseDAO dao;
    private ServiceModel model;
    private WebView webView;
    public static final String BATTALRAM_DATASERVICE_NAME = "Battalram_dataService";//JS调用类名
    private DBHelper dbHelper;
    public Battalram_dataService(WebView webView, DBHelper dbHelper) {
        this.dao= BaseDAOFactory.getBaseDAO(BaseDAO.BATTALRAM_DATA);
        this.model=new ServiceModel();
        this.webView = webView;
        this.dbHelper = dbHelper;
    }
    //根据battfroupid查询历史数据查询
    @JavascriptInterface
    public  void  serchByCondition(String obj) {
        SQLiteDatabase db=dbHelper.getWritableDatabase();
        Battalram_data adata= ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(obj,Battalram_data.class);
        List list=dao.serchByCondition(db,adata);
        if(list!=null&&list.size()>0){
            model.code=1;
            model.data=list;
            model.msg="查询成功";
        }else{
            model.code=0;
            model.msg="查询失败";
        }
        db.close();
        ActionUtil.SendCallDataToJS(BATTALRAM_DATASERVICE_NAME,"serchByCondition",model,webView,ActionUtil.getGson("yyyy-MM-dd HH:mm:ss"));
    }
}