Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git i...

whyclj

2019-01-09 5c1209b81f457cca5711a75192dd5f049244ebcf

Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$1.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$2.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$1.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$2.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$3.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction$1.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/UinfDaoFactory.class

Binary files differ

 gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java

@@ -18,6 +18,7 @@
    private Fbs9100_battparamService service=new Fbs9100_battparamService();

    private User_logService uservice=new User_logService();

    private String json;

    private String json_msg;

    private String result;

    

    //获取电池参数信息

@@ -49,6 +50,11 @@
    public String updatePro() {

        List<Fbs9100_battparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_battparam>>(){}.getType());

        ServiceModel model = service.updatePro(list);

        {

             String msg="批量设置"+json_msg+"的电池参数信息";

             User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Batch, msg);

             uservice.add(ulog);//将用户的操作记录下来

        }

        result = tojson(model);        

        return SUCCESS;    

    }

@@ -64,6 +70,11 @@
    public String readPL() {

        List<Fbs9100_battparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_battparam>>(){}.getType());

        ServiceModel model = service.readPL(list);

        {

             String msg="批量读取"+json_msg+"的电池参数信息";

             User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Batch, msg);

             uservice.add(ulog);//将用户的操作记录下来

        }

        result = tojson(model);        

        return SUCCESS;    

    }

@@ -78,6 +89,9 @@
    public void setJson(String json) {

        this.json = json;

    }

    public void setJson_msg(String json_msg) {

        this.json_msg = json_msg;

    }

    

    




 gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java

@@ -19,6 +19,7 @@
    private Fbs9100_setparamService service = new Fbs9100_setparamService();

    private User_logService uservice=new User_logService();

    private String json;

    private String json_msg;

    private String result;

    

    //根据机房编号和维护区查询放电机房的信息和放电参数

@@ -53,6 +54,11 @@
    public String updatePro() {

        List<Fbs9100_setparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_setparam>>(){}.getType());

        ServiceModel model = service.updatePro(list);

        {

             String msg="批量设置"+json_msg+"的放电参数";

             User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Batch, msg);

             uservice.add(ulog);//将用户的操作记录下来

        }

        result = tojson(model);        

        return SUCCESS;    

    }

@@ -60,6 +66,11 @@
    public String updatePro_dis() {

        List<Fbs9100_setparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_setparam>>(){}.getType());

        ServiceModel model = service.updatePro_dis(list);

        {

             String msg="批量启动"+json_msg+"的放电";

             User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Batch, msg);

             uservice.add(ulog);//将用户的操作记录下来

        }

        result = tojson(model);        

        return SUCCESS;    

    }

@@ -148,5 +159,9 @@
    public void setJson(String json) {

        this.json = json;

    }



    public void setJson_msg(String json_msg) {

        this.json_msg = json_msg;

    }

    

}


 gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java

@@ -18,6 +18,7 @@
    private Fbs9100_sysparamService service=new Fbs9100_sysparamService();

    private User_logService uservice=new User_logService();

    private String json;

    private String json_msg;

    private String result;

    

    //修改系统参数

@@ -42,6 +43,11 @@
    public String updatePro() {

        List<Fbs9100_sysparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_sysparam>>(){}.getType());

        ServiceModel model = service.updatePro(list);

        {

             String msg="批量设置"+json_msg+"的系统参数";

             User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Batch, msg);

             uservice.add(ulog);//将用户的操作记录下来

        }

        result = tojson(model);        

        return SUCCESS;    

    }

@@ -68,6 +74,9 @@
    public void setJson(String json) {

        this.json = json;

    }

    public void setJson_msg(String json_msg) {

        this.json_msg = json_msg;

    }

    

    




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

@@ -21,7 +21,8 @@
    public static int Cancel=7;        //取消

    public static int Start_up=8;      //启动

    public static int End=9;           //终止

   
    public static int Batch=10;        //批量



    

    //构建user_log对象<msg和type没写>

    public static User_log CreateULog(int op_type,String msg){