~whyclxw/gx_tieta.git

parent: a3d3feda | 补丁 | 提交 | ignore whitespace

Administrator

2021-01-19 d6f452b6c1e419d9ca4f35ff90d12fec0786185f

修改平台成为在线版本平台

8个文件已修改

	gx_tieta/WebRoot/index-outline.jsp	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/WebRoot/js/buildNav.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/src/com/fgkj/dao/BattTestData.java	70 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/src/com/fgkj/services/BattInfServices.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/src/com/fgkj/services/Battinf_applyService.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/src/com/fgkj/services/User_ChartService.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gx_tieta/src/com/fgkj/servlets/EchartPictureDowloadServlet.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 gx_tieta/WebRoot/index-outline.jsp

@@ -741,8 +741,8 @@
                //$('#map .img-change').show();

            }

            

            if(map != 1) {                        //长春市设为中心点

                var point = new BMap.Point(125.3192,43.8090);

            if(map != 1) {                        //贵州铜仁

                var point = new BMap.Point(109.1799,27.7455);

                map.centerAndZoom(point, 11);    // 用城市名设置地图中心点

                centerMapByPoint(map); // 根据当前用户设定的位置显示中心点

                map.enableScrollWheelZoom();


 gx_tieta/WebRoot/js/buildNav.js

@@ -53,8 +53,8 @@
         
         //电池放电测试
         {permit_item_name:'batt_test_op_permit',num:58},    //电池放电测试
         {permit_item_name:'batt_test_op_permit',num:81},    //批量电池放电测试
         //{permit_item_name:'batt_discharge_model_permit',num:81},    //批量电池放电测试
         //{permit_item_name:'batt_test_op_permit',num:81},    //批量电池放电测试
         {permit_item_name:'batt_discharge_model_permit',num:81},    //批量电池放电测试
         
         {permit_item_name:'batt_discharge_model_permit',num:59},        //设备充放电模块参数
         {permit_item_name:'battcfg_query_permit', num:63},        //电池信息配置

 gx_tieta/src/com/fgkj/dao/BattTestData.java

@@ -4,6 +4,8 @@
import java.io.IOException;

import java.io.InputStream;



import main.main_BTS_DB_Builder;



public class BattTestData {

    final public static int BATT_DISCHARGE=3;//放电测试

    final public static int BATT_RES=5;//内阻测试

@@ -107,12 +109,72 @@
    }

    

    //启动创建数据库的jar文件

    public static void DB_Builder() {

        System.out.println("###############");

        main_BTS_DB_Builder.init();

        System.out.println("###############");

    }

	
    //启动创建数据库的jar文件

    public static void run_cmd() {

        //识别服务器的系统类型

          String OS = System.getProperty("os.name").toLowerCase();

          //System.out.println(OS);

          if(OS.contains("window")) {

              runWindowCmd();

          }else {

              runLinuxCmd();

          }

    }

	
    public static void runLinuxCmd(){

        String path=System.getProperty("user.dir");                //myeclipse中获取的目录(获取到的是tomcat/bin)和分离项目获取到的路径(tomcat)不一样

        //System.out.println(path);

        System.out.println(path);

//        String realapth=path.substring(0,path.lastIndexOf("\\"));

        //String strcmd=" cmd /c start  "+realapth+"/webapps/cmd_BTSE_DB_Builder.cmd";

        String strcmd="java -jar /app/BTSE_DB_Builder.jar";

//        String batPath = realapth+"/webapps/cmd_BTSE_DB_Builder.cmd";

//        File f = new File(path);

//        //System.out.println("File :"+f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"cmd_BTSE_DB_Builder.cmd");

//        //batPath = f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"cmd_BTSE_DB_Builder.cmd";

//        String jarPath = "";

//        if(path.endsWith("bin")){

//            f = f.getParentFile();

//        }

//		
//        jarPath = f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"BTSE_DB_Builder.exe";                //主程序中exe的目录

        //strcmd = "cmd /c start "+batPath;

        //strcmd = ("cmd /c start ")+jarPath.replaceAll(" ", "\" \"");            //修复绝对路径中存在空格时执行不成功bug

        System.out.println(strcmd);

        Process child = null;

        InputStream in = null;

        try {

            //System.out.println(strcmd);

            child = Runtime.getRuntime().exec(strcmd);

            in = child.getInputStream();

            int c;

            while ((c = in.read()) != -1) {

                //System.out.print((char)c);

            }

            in.close();

            try {

                child.waitFor();

            } catch (InterruptedException e) {

                e.printStackTrace();

            }

            //System.out.println("Run Bat OK....");

        } catch (IOException e) {

            e.printStackTrace();

        } 
    }

	
    public static void runWindowCmd(){

        String path=System.getProperty("user.dir");                //myeclipse中获取的目录(获取到的是tomcat/bin)和分离项目获取到的路径(tomcat)不一样

        System.out.println(path);

        String realapth=path.substring(0,path.lastIndexOf("\\"));

        String strcmd="cmd /c start  "+realapth+"/webapps/cmd_BTSE_DB_Builder.cmd";

        String batPath = realapth+"/webapps/cmd_BTSE_DB_Builder.cmd";

        String strcmd=" cmd /c start  "+realapth+"/webapps/cmd_BTSE_DB_Builder.cmd";

        //String strcmd="java -jar /app/BTSE_DB_Builder.jar";

        //String batPath = realapth+"/webapps/cmd_BTSE_DB_Builder.cmd";

        File f = new File(path);

        //System.out.println("File :"+f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"cmd_BTSE_DB_Builder.cmd");

        //batPath = f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"cmd_BTSE_DB_Builder.cmd";

@@ -145,7 +207,7 @@
        } catch (IOException e) {

            e.printStackTrace();

        } 

    }

    }

    

    //判断电池组的当前状态

    public static String battState(int num){


 gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java

@@ -163,6 +163,7 @@
        }

        (new User_logService()).addPro(listU);//将用户的操作记录下来

        BattTestData.run_cmd();

        //BattTestData.DB_Builder();

        return bl;

        

    }


 gx_tieta/src/com/fgkj/services/BattInfServices.java

@@ -83,6 +83,7 @@
            /*App_Sys as=new App_Sys();
            as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN);
            Boolean b=(new App_SysImpl()).update(as);*/
            //BattTestData.DB_Builder();
            BattTestData.run_cmd();
            //将告警的服务设为重启
            Process_survey process=new Process_survey();
@@ -153,6 +154,7 @@
            as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN);
            Boolean b=(new App_SysImpl()).update(as);*/
            BattTestData.run_cmd();
            //BattTestData.DB_Builder();
            //将告警的服务设为重启
            Process_survey process=new Process_survey();
            process.setProcessName(ProcessServerDao.BMS_FBSDEV_ALARM_BATT);

 gx_tieta/src/com/fgkj/services/Battinf_applyService.java

@@ -24,6 +24,7 @@
    public ServiceModel update(Object obj){

        boolean bl=dao.update(obj);

        if(bl){

            //BattTestData.DB_Builder();

            BattTestData.run_cmd();

            //将告警的服务设为重启

            Process_survey process=new Process_survey();


 gx_tieta/src/com/fgkj/services/User_ChartService.java

@@ -114,7 +114,7 @@
         User_ChartService us=new User_ChartService();

        User_Chart uchart=new User_Chart();

        uchart.setChart_file("gjdw");

        uchart.setChart_logo(new File("D://GitWorkSpace/tieta/fuguang/WebRoot/images/tieta/logo.png"));

        uchart.setChart_logo(new File("C:\\Users\\LiJun\\Desktop\\images\\gjdw\\favicon.ico"));

        us.update(uchart);

    }

}


 gx_tieta/src/com/fgkj/servlets/EchartPictureDowloadServlet.java

@@ -275,7 +275,7 @@
        

        String[][] mon_vol_list = ActionUtil.getGson().fromJson(req.getParameter("mon-vol-list"), String[][].class);

        String[][] mon_tmp_list = ActionUtil.getGson().fromJson(req.getParameter("mon-tmp-list"), String[][].class);

        List<Batttestdata> groupinfo = ActionUtil.getGson().fromJson(req.getParameter("mon-group-list"),  new TypeToken<List<Batttestdata>>(){}.getType());

        List<Batttestdata> groupinfo = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(req.getParameter("mon-group-list"),  new TypeToken<List<Batttestdata>>(){}.getType());

        

        //System.out.println("mon_vol_list:"+mon_vol_list.length+"\t mon_tmp_list:"+mon_tmp_list.length+"\t groupinfo:"+groupinfo.size());

			@@ -741,8 +741,8 @@
			//$('#map .img-change').show();
			}

			if(map != 1) { //长春市设为中心点
			var point = new BMap.Point(125.3192,43.8090);
			if(map != 1) { //贵州铜仁
			var point = new BMap.Point(109.1799,27.7455);
			map.centerAndZoom(point, 11); // 用城市名设置地图中心点
			centerMapByPoint(map); // 根据当前用户设定的位置显示中心点
			map.enableScrollWheelZoom();

			@@ -53,8 +53,8 @@

			//电池放电测试
			{permit_item_name:'batt_test_op_permit',num:58}, //电池放电测试
			{permit_item_name:'batt_test_op_permit',num:81}, //批量电池放电测试
			//{permit_item_name:'batt_discharge_model_permit',num:81}, //批量电池放电测试
			//{permit_item_name:'batt_test_op_permit',num:81}, //批量电池放电测试
			{permit_item_name:'batt_discharge_model_permit',num:81}, //批量电池放电测试

			{permit_item_name:'batt_discharge_model_permit',num:59}, //设备充放电模块参数
			{permit_item_name:'battcfg_query_permit', num:63}, //电池信息配置

			@@ -4,6 +4,8 @@
			import java.io.IOException;
			import java.io.InputStream;

			import main.main_BTS_DB_Builder;

			public class BattTestData {
			final public static int BATT_DISCHARGE=3;//放电测试
			final public static int BATT_RES=5;//内阻测试
			@@ -107,12 +109,72 @@
			}

			//启动创建数据库的jar文件
			public static void DB_Builder() {
			System.out.println("###############");
			main_BTS_DB_Builder.init();
			System.out.println("###############");
			}

			//启动创建数据库的jar文件
			public static void run_cmd() {
			//识别服务器的系统类型
			String OS = System.getProperty("os.name").toLowerCase();
			//System.out.println(OS);
			if(OS.contains("window")) {
			runWindowCmd();
			}else {
			runLinuxCmd();
			}
			}

			public static void runLinuxCmd(){
			String path=System.getProperty("user.dir"); //myeclipse中获取的目录(获取到的是tomcat/bin)和分离项目获取到的路径(tomcat)不一样
			//System.out.println(path);
			System.out.println(path);
			// String realapth=path.substring(0,path.lastIndexOf("\\"));
			//String strcmd=" cmd /c start "+realapth+"/webapps/cmd_BTSE_DB_Builder.cmd";
			String strcmd="java -jar /app/BTSE_DB_Builder.jar";
			// String batPath = realapth+"/webapps/cmd_BTSE_DB_Builder.cmd";
			// File f = new File(path);
			// //System.out.println("File :"+f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"cmd_BTSE_DB_Builder.cmd");
			// //batPath = f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"cmd_BTSE_DB_Builder.cmd";
			// String jarPath = "";
			// if(path.endsWith("bin")){
			// f = f.getParentFile();
			// }
			//
			// jarPath = f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"BTSE_DB_Builder.exe"; //主程序中exe的目录
			//strcmd = "cmd /c start "+batPath;
			//strcmd = ("cmd /c start ")+jarPath.replaceAll(" ", "\" \""); //修复绝对路径中存在空格时执行不成功bug
			System.out.println(strcmd);
			Process child = null;
			InputStream in = null;
			try {
			//System.out.println(strcmd);
			child = Runtime.getRuntime().exec(strcmd);
			in = child.getInputStream();
			int c;
			while ((c = in.read()) != -1) {
			//System.out.print((char)c);
			}
			in.close();
			try {
			child.waitFor();
			} catch (InterruptedException e) {
			e.printStackTrace();
			}
			//System.out.println("Run Bat OK....");
			} catch (IOException e) {
			e.printStackTrace();
			}
			}

			public static void runWindowCmd(){
			String path=System.getProperty("user.dir"); //myeclipse中获取的目录(获取到的是tomcat/bin)和分离项目获取到的路径(tomcat)不一样
			System.out.println(path);
			String realapth=path.substring(0,path.lastIndexOf("\\"));
			String strcmd="cmd /c start "+realapth+"/webapps/cmd_BTSE_DB_Builder.cmd";
			String batPath = realapth+"/webapps/cmd_BTSE_DB_Builder.cmd";
			String strcmd=" cmd /c start "+realapth+"/webapps/cmd_BTSE_DB_Builder.cmd";
			//String strcmd="java -jar /app/BTSE_DB_Builder.jar";
			//String batPath = realapth+"/webapps/cmd_BTSE_DB_Builder.cmd";
			File f = new File(path);
			//System.out.println("File :"+f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"cmd_BTSE_DB_Builder.cmd");
			//batPath = f.getParentFile().getAbsolutePath()+File.separator+"Batt_MS_FBSDEV_X64/Batt_MS_FBSDEV/"+"cmd_BTSE_DB_Builder.cmd";
			@@ -145,7 +207,7 @@
			} catch (IOException e) {
			e.printStackTrace();
			}
			}
			}

			//判断电池组的当前状态
			public static String battState(int num){

			@@ -163,6 +163,7 @@
			}
			(new User_logService()).addPro(listU);//将用户的操作记录下来
			BattTestData.run_cmd();
			//BattTestData.DB_Builder();
			return bl;

			}

			@@ -83,6 +83,7 @@
			/*App_Sys as=new App_Sys();
			as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN);
			Boolean b=(new App_SysImpl()).update(as);*/
			//BattTestData.DB_Builder();
			BattTestData.run_cmd();
			//将告警的服务设为重启
			Process_survey process=new Process_survey();
			@@ -153,6 +154,7 @@
			as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN);
			Boolean b=(new App_SysImpl()).update(as);*/
			BattTestData.run_cmd();
			//BattTestData.DB_Builder();
			//将告警的服务设为重启
			Process_survey process=new Process_survey();
			process.setProcessName(ProcessServerDao.BMS_FBSDEV_ALARM_BATT);

			@@ -24,6 +24,7 @@
			public ServiceModel update(Object obj){
			boolean bl=dao.update(obj);
			if(bl){
			//BattTestData.DB_Builder();
			BattTestData.run_cmd();
			//将告警的服务设为重启
			Process_survey process=new Process_survey();

			@@ -114,7 +114,7 @@
			User_ChartService us=new User_ChartService();
			User_Chart uchart=new User_Chart();
			uchart.setChart_file("gjdw");
			uchart.setChart_logo(new File("D://GitWorkSpace/tieta/fuguang/WebRoot/images/tieta/logo.png"));
			uchart.setChart_logo(new File("C:\\Users\\LiJun\\Desktop\\images\\gjdw\\favicon.ico"));
			us.update(uchart);
			}
			}

			@@ -275,7 +275,7 @@

			String[][] mon_vol_list = ActionUtil.getGson().fromJson(req.getParameter("mon-vol-list"), String[][].class);
			String[][] mon_tmp_list = ActionUtil.getGson().fromJson(req.getParameter("mon-tmp-list"), String[][].class);
			List<Batttestdata> groupinfo = ActionUtil.getGson().fromJson(req.getParameter("mon-group-list"), new TypeToken<List<Batttestdata>>(){}.getType());
			List<Batttestdata> groupinfo = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(req.getParameter("mon-group-list"), new TypeToken<List<Batttestdata>>(){}.getType());

			//System.out.println("mon_vol_list:"+mon_vol_list.length+"\t mon_tmp_list:"+mon_tmp_list.length+"\t groupinfo:"+groupinfo.size());