lxw
2021-03-13 30e0a6876452d5ca043d54dfbc72e17e2365f39f
修改接口
6个文件已修改
86 ■■■■■ 已修改文件
Dev_FastAcquisition/src/com/fgkj/Impl/Dev_VolImpl.java 54 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Dev_FastAcquisition/src/com/fgkj/action/ActionUtil.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Dev_FastAcquisition/src/com/fgkj/action/Dev_VolAction.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Dev_FastAcquisition/src/com/fgkj/db/BaseDAO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Dev_FastAcquisition/src/com/fgkj/pojo/Dev_Vol.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Dev_FastAcquisition/src/com/fgkj/service/Dev_VolService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Dev_FastAcquisition/src/com/fgkj/Impl/Dev_VolImpl.java
@@ -19,6 +19,7 @@
import com.fgkj.db.CallBack;
import com.fgkj.pojo.Dev_Vol;
import com.fgkj.service.Dev_VolService;
import com.sun.org.apache.bcel.internal.generic.DCMPG;
public class Dev_VolImpl implements BaseDAO,CallBack{
@@ -45,40 +46,15 @@
        // TODO Auto-generated method stub
        return false;
    }
    //读取全图
    @Override
    public List searchAll() {
        String filePath=getfilePath(1);
        List list=new ArrayList();
        try {
             File csv=new File(filePath);
             csv.setReadable(true);//设置可读
             csv.setWritable(true);//设置可写
             LineNumberReader br = new LineNumberReader(new FileReader(csv));
             String line = "";
             String everyLine = "";
             try {
                 while ((line = br.readLine()) != null) // 读取到的内容给line变量
                 {   if(br.getLineNumber() >= 1500&&br.getLineNumber() <= 101500) {
                         everyLine = line;
                         list.add(changeStrToDev_Vol(everyLine,1));
                     }
                 }
                 System.out.println("csv表格中所有行数:" + list.size());
             } catch (IOException e) {
                 e.printStackTrace();
             }
        } catch (Exception e) {
             System.out.println(e);
        }
        return list;
        return null;
    }
    //读取全图
    @Override
    public List serchByCondition(Object obj) {
        Dev_Vol dv=(com.fgkj.pojo.Dev_Vol) obj;
        String filePath=getfilePath(1);
        Dev_Vol dv=(Dev_Vol) obj;
        String filePath=getfilePath(dv.getFileName());
        List list=new ArrayList();
        try {
            
@@ -95,7 +71,7 @@
                         list.add(changeStrToDev_Vol(everyLine,1));
                     }
                 }
                 System.out.println("csv表格中所有行数:" + list.size());
                 //System.out.println("csv表格中所有行数:" + list.size());
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -111,8 +87,9 @@
        return null;
    }
    //读取缩略图
    public List searchAbbreviation(){
        String filePath=getfilePath(0);
    public List searchAbbreviation(Object obj){
        Dev_Vol dc=(Dev_Vol) obj;
        String filePath=getfilePath(dc.getFileName());
        List list=new ArrayList();
        try {
            /*
@@ -141,7 +118,7 @@
                     everyLine = line;
                     list.add(changeStrToDev_Vol(everyLine,0));
                 }
                 System.out.println("csv表格中所有行数:" + list.size());
                 //System.out.println("csv表格中所有行数:" + list.size());
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -166,7 +143,7 @@
        return dv;
    }
    //读取文件路径
    public static String getfilePath(int flag) {
    public static String getfilePath(String fileName) {
        //String path=this.getClass().getResource("/").getPath();
        String loadpath =ActionUtil.getSession().getServletContext().getRealPath("/");
        //String filePath = "D:/apache-tomcat-7.0.105/webapps/Dev_FastAcquisition/WEB-INF/电压2020_03_04_10_00_dgls.csv";
@@ -174,11 +151,12 @@
        String str=loadpath.substring(0, loadpath.lastIndexOf("Dev_FastAcquisition"));
        //System.out.println(str);
        String filePath=null;
        if(flag==0) {
             filePath=str+File.separator+"csv"+File.separator+"电压2020_03_04_10_00_dgls.csv";
        }else {
             filePath=str+File.separator+"csv"+File.separator+"电压2020_03_04_10_00.csv";
        }
//        if(flag==0) {
//             filePath=str+File.separator+"csv"+File.separator+"电压2020_03_04_10_00_dgls.csv";
//        }else {
//             filePath=str+File.separator+"csv"+File.separator+"电压2020_03_04_10_00.csv";
//        }
        filePath=str+File.separator+"csv"+File.separator+fileName;
        return filePath;
    }
}
Dev_FastAcquisition/src/com/fgkj/action/ActionUtil.java
@@ -97,6 +97,7 @@
        Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss.SSS").create();
        return gson.toJson(obj);
    }
    public static String chageDateToString(Date time,String type){
        String msg = "";
        SimpleDateFormat sdf = new SimpleDateFormat(type);
Dev_FastAcquisition/src/com/fgkj/action/Dev_VolAction.java
@@ -8,11 +8,13 @@
    public Dev_VolService service=new Dev_VolService();
    public String json;
    public String result;
    
    
    //加载服务器数据缩略图
    public String searchAbbreviation() {
        ServiceModel model=service.searchAbbreviation();
        Dev_Vol dv=ActionUtil.getGson().fromJson(json,Dev_Vol.class);
        ServiceModel model=service.searchAbbreviation(dv);
        result=tojson(model);
        return SUCCESS;
    }
Dev_FastAcquisition/src/com/fgkj/db/BaseDAO.java
@@ -4,7 +4,7 @@
public interface BaseDAO {
    
    public static final int Dev_Vol = 1;
    public static final int DEV_VOL = 1;
    
//    public static final int DYNAMICLOAD_BUTTON_RT = 2;
//    public static final int DYNAMICLOAD_STATE_RT = 3;
Dev_FastAcquisition/src/com/fgkj/pojo/Dev_Vol.java
@@ -6,8 +6,9 @@
    private String dateStr;
    private double dev_vol;
    private int num;
    private int startNum;
    private int stopNum;
    private int startNum;//开始行数
    private int stopNum;//结束行数
    private String fileName;//文件名称
    public String getDateStr() {
        return dateStr;
    }
@@ -38,6 +39,17 @@
    public void setStopNum(int stopNum) {
        this.stopNum = stopNum;
    }
    public String getFileName() {
        return fileName;
    }
    public void setFileName(String fileName) {
        this.fileName = fileName;
    }
    @Override
    public String toString() {
        return "Dev_Vol [dateStr=" + dateStr + ", dev_vol=" + dev_vol + ", num=" + num + ", startNum=" + startNum
                + ", stopNum=" + stopNum + ", fileName=" + fileName + "]";
    }
    
    
    
Dev_FastAcquisition/src/com/fgkj/service/Dev_VolService.java
@@ -18,12 +18,12 @@
    
    public Dev_VolService() {
        super();
        dao=BaseDAOFactory.getBaseDAO(BaseDAO.Dev_Vol);
        dao=BaseDAOFactory.getBaseDAO(BaseDAO.DEV_VOL);
        model=new ServiceModel();
    }
    //加载服务器数据缩略图
    public ServiceModel searchAbbreviation() {
        List list=((Dev_VolImpl)dao).searchAbbreviation();
    public ServiceModel searchAbbreviation(Object obj) {
        List list=((Dev_VolImpl)dao).searchAbbreviation(obj);
        if(list!=null&&list.size()>0) { 
            model.setData(list);
            model.setCode(1); 
@@ -53,8 +53,5 @@
            model.setCode(0); 
        }
        return model;
    }
    public static void main(String[] args) {
        new Dev_VolService().searchAbbreviation();
    }
}