whycrzh
2021-01-26 8010e34a785c98db46bb8d604cc4a3952ffcf025
update Batttestdatastop、BTS_61850_setparam、BTS_61850_state and relatedReference
6个文件已修改
146 ■■■■■ 已修改文件
src/main/java/com/fgkj/controller/bts61850/BTS_61850_setparamController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/dto/BTS_61850_setparam.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/dto/BTS_61850_state.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/dto/Batttestdatastop.java 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/services/bts61850/BTS_61850_setparamService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/bts61850/BTS_61850_setparamMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/controller/bts61850/BTS_61850_setparamController.java
@@ -45,7 +45,7 @@
    public ServiceModel update(@RequestBody BTS_61850_setparam bts) {
        ServiceModel model=service.update(bts);
        {   String msg="";
            msg="修改"+bts.getFBSDeviceId()+"的设备参数";
            msg="修改"+bts.getFbsDeviceId()+"的设备参数";
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
            uservice.add(ulog);//将用户的操作记录下来
        }
@@ -58,11 +58,11 @@
        ServiceModel model=service.updateCMd(bts);
        {   String msg="";
            if(bts.getNum()==FBS9100_ComBase.CMD_61850_START_HR){
                msg="启动"+bts.getFBSDeviceId()+"的设备核容放电";
                msg="启动"+bts.getFbsDeviceId()+"的设备核容放电";
            }else if(bts.getNum()==FBS9100_ComBase.CMD_61850_START_RES){
                msg="启动"+bts.getFBSDeviceId()+"的设备内阻放电";
                msg="启动"+bts.getFbsDeviceId()+"的设备内阻放电";
            }else if(bts.getNum()==FBS9100_ComBase.CMD_61850_STOP){
                msg="停止"+bts.getFBSDeviceId()+"的设备放电";
                msg="停止"+bts.getFbsDeviceId()+"的设备放电";
            }
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
            uservice.add(ulog);//将用户的操作记录下来
src/main/java/com/fgkj/dto/BTS_61850_setparam.java
@@ -8,7 +8,7 @@
@Alias("BTS_61850_setparam")
public class BTS_61850_setparam implements Serializable{
    private int num;
    private int FBSDeviceId;
    private int fbsDeviceId;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
    private Date set_time;
    private int batt_test;
@@ -25,12 +25,15 @@
    public void setNum(int num) {
        this.num = num;
    }
    public int getFBSDeviceId() {
        return FBSDeviceId;
    public int getFbsDeviceId() {
        return fbsDeviceId;
    }
    public void setFBSDeviceId(int fBSDeviceId) {
        FBSDeviceId = fBSDeviceId;
    public void setFbsDeviceId(int fbsDeviceId) {
        this.fbsDeviceId = fbsDeviceId;
    }
    public Date getSet_time() {
        return set_time;
    }
@@ -85,17 +88,21 @@
    public void setTestcmd(int testcmd) {
        this.testcmd = testcmd;
    }
    @Override
    public String toString() {
        return "BTS_61850_setparam [num=" + num + ", FBSDeviceId="
                + FBSDeviceId + ", set_time=" + set_time + ", batt_test="
                + batt_test + ", set_discurr=" + set_discurr + ", set_distime="
                + set_distime + ", set_discap=" + set_discap + ", set_tep_dis="
                + set_tep_dis + ", set_groupvol_low=" + set_groupvol_low
                + ", set_monvollow=" + set_monvollow + ", testcmd=" + testcmd
                + "]";
        return "BTS_61850_setparam{" +
                "num=" + num +
                ", fbsDeviceId=" + fbsDeviceId +
                ", set_time=" + set_time +
                ", batt_test=" + batt_test +
                ", set_discurr=" + set_discurr +
                ", set_distime=" + set_distime +
                ", set_discap=" + set_discap +
                ", set_tep_dis=" + set_tep_dis +
                ", set_groupvol_low=" + set_groupvol_low +
                ", set_monvollow=" + set_monvollow +
                ", testcmd=" + testcmd +
                '}';
    }
}
src/main/java/com/fgkj/dto/BTS_61850_state.java
@@ -8,7 +8,7 @@
@Alias("BTS_61850_state")
public class BTS_61850_state implements Serializable{
    private int num;
    private int FBSDeviceId;
    private int fbsDeviceId;
    private String dev_ip;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
    private Date stc_datatime;
@@ -34,12 +34,15 @@
    public void setNum(int num) {
        this.num = num;
    }
    public int getFBSDeviceId() {
        return FBSDeviceId;
    public int getFbsDeviceId() {
        return fbsDeviceId;
    }
    public void setFBSDeviceId(int fBSDeviceId) {
        FBSDeviceId = fBSDeviceId;
    public void setFbsDeviceId(int fbsDeviceId) {
        this.fbsDeviceId = fbsDeviceId;
    }
    public Date getStc_datatime() {
        return stc_datatime;
    }
@@ -150,22 +153,30 @@
    public void setTimelong(int timelong) {
        this.timelong = timelong;
    }
    @Override
    public String toString() {
        return "BTS_61850_state [num=" + num + ", FBSDeviceId=" + FBSDeviceId
                + ", dev_ip=" + dev_ip + ", stc_datatime=" + stc_datatime
                + ", stc_groupvol_low=" + stc_groupvol_low + ", stc_cap_high="
                + stc_cap_high + ", stc_timespan_high=" + stc_timespan_high
                + ", stc_discurr=" + stc_discurr + ", stc_monvol_low="
                + stc_monvol_low + ", stc_montmp_high=" + stc_montmp_high
                + ", stc_workstate=" + stc_workstate + ", alam_tmp=" + alam_tmp
                + ", alam_relay=" + alam_relay + ", alam_comm=" + alam_comm
                + ", dev_captest_online=" + dev_captest_online
                + ", dev_captest_groupvol=" + dev_captest_groupvol
                + ", timelong=" + timelong + ", dev_errcommcount="
                + dev_errcommcount + ", dev_commcount=" + dev_commcount
                + ", page=" + pageBean + "]";
        return "BTS_61850_state{" +
                "num=" + num +
                ", fbsDeviceId=" + fbsDeviceId +
                ", dev_ip='" + dev_ip + '\'' +
                ", stc_datatime=" + stc_datatime +
                ", stc_groupvol_low=" + stc_groupvol_low +
                ", stc_cap_high=" + stc_cap_high +
                ", stc_timespan_high=" + stc_timespan_high +
                ", stc_discurr=" + stc_discurr +
                ", stc_monvol_low=" + stc_monvol_low +
                ", stc_montmp_high=" + stc_montmp_high +
                ", stc_workstate=" + stc_workstate +
                ", alam_tmp=" + alam_tmp +
                ", alam_relay=" + alam_relay +
                ", alam_comm=" + alam_comm +
                ", dev_captest_online=" + dev_captest_online +
                ", dev_captest_groupvol=" + dev_captest_groupvol +
                ", timelong=" + timelong +
                ", dev_errcommcount=" + dev_errcommcount +
                ", dev_commcount=" + dev_commcount +
                ", pageBean=" + pageBean +
                '}';
    }
}
src/main/java/com/fgkj/dto/Batttestdatastop.java
@@ -8,7 +8,7 @@
@Alias("Batttestdatastop")
public class Batttestdatastop implements Serializable{
    private Integer num;
    private Integer BattGroupId;
    private Integer battGroupId;
    private Integer test_record_count;
    private Integer test_type;
    private Integer data_new;
@@ -42,11 +42,11 @@
    }
    public Integer getBattGroupId() {
        return BattGroupId;
        return battGroupId;
    }
    public void setBattGroupId(Integer battGroupId) {
        BattGroupId = battGroupId;
        this.battGroupId = battGroupId;
    }
    public Integer getTest_record_count() {
@@ -197,23 +197,27 @@
    @Override
    public String toString() {
        return "Batttestdatastop [num=" + num + ", BattGroupId=" + BattGroupId
                + ", test_record_count=" + test_record_count + ", test_type="
                + test_type + ", data_new=" + data_new + ", data_available="
                + data_available + ", record_num=" + record_num
                + ", test_starttime=" + test_starttime + ", record_time="
                + record_time + ", test_timelong=" + test_timelong
                + ", group_vol=" + group_vol + ", test_curr=" + test_curr
                + ", test_cap=" + test_cap + ", mon_num=" + mon_num
                + ", mon_vol=" + mon_vol + ", lowC=" + lowC + ", lowV=" + lowV
                + ", mon_avg=" + mon_avg + ", mon_min=" + mon_min
                + ", mon_max=" + mon_max + "]";
        return "Batttestdatastop{" +
                "num=" + num +
                ", battGroupId=" + battGroupId +
                ", test_record_count=" + test_record_count +
                ", test_type=" + test_type +
                ", data_new=" + data_new +
                ", data_available=" + data_available +
                ", record_num=" + record_num +
                ", test_starttime=" + test_starttime +
                ", record_time=" + record_time +
                ", test_timelong=" + test_timelong +
                ", group_vol=" + group_vol +
                ", test_curr=" + test_curr +
                ", test_cap=" + test_cap +
                ", mon_num=" + mon_num +
                ", mon_vol=" + mon_vol +
                ", lowC=" + lowC +
                ", lowV=" + lowV +
                ", mon_avg=" + mon_avg +
                ", mon_min=" + mon_min +
                ", mon_max=" + mon_max +
                '}';
    }
}
src/main/java/com/fgkj/services/bts61850/BTS_61850_setparamService.java
@@ -41,7 +41,7 @@
    public ServiceModel updateCMd(Object obj) {
        ServiceModel model =new ServiceModel();
        BTS_61850_setparam bts=(BTS_61850_setparam) obj;
        boolean bl=mapper.sendCmdTo61850Dev(bts.getNum(), bts.getFBSDeviceId());
        boolean bl=mapper.sendCmdTo61850Dev(bts.getNum(), bts.getFbsDeviceId());
        if(bl){
            model.setCode(1);
            model.setMsg("修改成功!");
src/main/resources/mapper/bts61850/BTS_61850_setparamMapper.xml
@@ -6,7 +6,7 @@
        <association property="binf" javaType="BattInf">
            <result column="BattGroupId" property="battGroupId"/>
            <result column="StationName" property="stationName"/>
            <result column="FBSDeviceId" property="FBSDeviceId"/>
            <result column="FBSDeviceId" property="fbsDeviceId"/>
            <result column="FBSDeviceIp" property="fbsDeviceIp"/>
            <result column="BattGroupName" property="battGroupName"/>
            <result column="MonCount" property="monCount"/>