81041
2018-11-03 dab560a713cf4f7250bb8398578e78c7940d225f
添加用户解决 问题
4个文件已修改
43 ■■■■ 已修改文件
gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dto/Deverror_record.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/services/Deverror_recordService.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java
@@ -52,6 +52,13 @@
        result=tojson(model);
        return SUCCESS;
    }
     //用户处理的结果
    public String update(){
        Deverror_record dev_record=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Deverror_record.class);
        ServiceModel model=service.update(dev_record);
        result=tojson(model);
        return SUCCESS;
    }
    //根据stationid查询设备的问题记录
    public String serchByCondition(){
        BattInf binf=getGson().fromJson(json, BattInf.class);
gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
@@ -26,12 +26,13 @@
   //用户手动添加问题
    public boolean add(Object obj) {
        Deverror_record dev_record=(Deverror_record) obj;
        String sql=" insert into db_battinf.tb_deverror_record(stationId,record_time,error_descript,uid,picture_num ";
        String endsql=") values(?,?,?,?,?";
        String sql=" insert into db_battinf.tb_deverror_record(stationId,record_time,error_descript,error_dispose,uid,picture_num ";
        String endsql=") values(?,?,?,?,?,?";
        List list=new ArrayList();
        list.add(dev_record.getStationId());
        list.add(dev_record.getRecord_time());
        list.add(dev_record.getError_descript());
        list.add(dev_record.getError_dispose());
        list.add(dev_record.getUid());
        list.add(dev_record.getPicture_num());
        if(dev_record.getPicture_num()>=1){
@@ -58,10 +59,12 @@
        boolean bl=DAOHelper.executeUpdatePicture(DBUtil.getConn(), sql, list);
        return bl;
    }
    //用户处理的结果
    public boolean update(Object obj) {
        // TODO Auto-generated method stub
        return false;
        Deverror_record dev_record=(Deverror_record) obj;
        String sql=" update db_battinf.tb_deverror_record set error_dispose=?,error_en=? where num=? ";
        boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{dev_record.getError_dispose(),dev_record.getError_en(),dev_record.getNum()});
        return bl;
    }
    public boolean del(Object obj) {
@@ -79,7 +82,7 @@
        Page p=binf.getPage();
        Connection conn=DBUtil.getConn();
        String numberSql=" SELECT FOUND_ROWS() number";
        String sql=" select SQL_CALC_FOUND_ROWS distinct tb_deverror_record.num,tb_deverror_record.stationid,record_time,error_descript,error_en,picture_num " +
        String sql=" select SQL_CALC_FOUND_ROWS distinct tb_deverror_record.num,tb_deverror_record.stationid,record_time,error_descript,error_en,error_dispose,picture_num " +
                "  ,db_battinf.tb_battinf.stationname,stationname1,stationname2,stationname3,stationname5 " +
                "  from db_battinf.tb_deverror_record,db_battinf.tb_battinf " +
                " where tb_deverror_record.stationid=tb_battinf.stationid " +
@@ -113,6 +116,7 @@
                        dev_record.setRecord_time(rs.getTimestamp("record_time"));
                        dev_record.setError_descript(rs.getString("error_descript"));
                        dev_record.setError_en(rs.getInt("error_en"));
                        dev_record.setError_dispose(rs.getString("error_dispose"));
                        dev_record.setPicture_num(rs.getInt("picture_num"));
                        Page page=new Page();
                        dev_record.setPage(page);
gx_tieta/src/com/fgkj/dto/Deverror_record.java
@@ -17,6 +17,7 @@
    private String stationName5;
    private Date record_time;
    private String error_descript;//问题描述
    private String error_dispose;//问题处理
    private int uid;
    private int error_en;         //问题是否解决
    private String note;
@@ -166,6 +167,13 @@
    public void setPicture_num(int picture_num) {
        this.picture_num = picture_num;
    }
    public String getError_dispose() {
        return error_dispose;
    }
    public void setError_dispose(String error_dispose) {
        this.error_dispose = error_dispose;
    }
    @Override
    public String toString() {
        return "Deverror_record [num=" + num + ", stationId=" + stationId
gx_tieta/src/com/fgkj/services/Deverror_recordService.java
@@ -28,6 +28,18 @@
        }
        return model;
    }
     //用户处理的结果
    public ServiceModel update(Object obj){
        boolean bl=dao.update(obj);
        if (bl) {
            model.setCode(1);
            model.setMsg("修改成功!");
        } else {
            model.setCode(0);
            model.setMsg("修改失败!");
        }
        return model;
    }
    //根据stationid查询设备的问题记录
    public ServiceModel serchByCondition(Object obj){
        List list=dao.serchByCondition(obj);