whycxzp
2022-04-09 d8f90e44e89846e1058a3243c73f8085636cdf18
接口追加字段packCount
2个文件已修改
19 ■■■■ 已修改文件
src/com/fgkj/dao/impl/BattInfImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/fgkj/dto/BattInf.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/fgkj/dao/impl/BattInfImpl.java
@@ -58,7 +58,7 @@
                        + "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
                        ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,DisCurrMax,station_phone "
                        + ",Vol_grade,Manufacturers,Assetequipment,Deviceclasspath,Deviceoperationdepartment,PropertyRightUnit,PropertyAttribute,FactoryNumber,OperationTeam "
                        + ",DeviceIdentityCode,ProjectType,BatteryApplicationType,SingleRatedVoltage,RemoteMonitor,BatttIndependentPlaced,JunChargeVoltageValue,video_url,charge_type,buscouple_state,tmp_id  " +
                        + ",DeviceIdentityCode,ProjectType,BatteryApplicationType,SingleRatedVoltage,RemoteMonitor,BatttIndependentPlaced,JunChargeVoltageValue,video_url,charge_type,buscouple_state,tmp_id,PackCount  " +
                        ") values('" + binf.getStationId() + "','" + binf.getStationName() + "','" + binf.getStationName1() + "','" + binf.getStationName2() + "','" + binf.getStationName3() + "','" + binf.getStationName4() +
                        "','" + binf.getStationName5() + "','" + binf.getStationIp() + "'," + binf.getFBSDeviceId() + ",'" + binf.getFbsDeviceIp() + "','" + binf.getFbsDeviceIp_YM() + "','" + binf.getFbsDeviceIp_WG() + "','" + binf.getFBSDeviceName() + "'," + binf.getGroupIndexInFBSDevice() +
                        "," + binf.getBattGroupId() + "," + binf.getBattGroupNum() + ",'" + binf.getBattGroupName() + "'," + binf.getFloatVolLevel() + "," + binf.getOfflineVolLevel() + "," + binf.getBattFloatCurrent() +
@@ -66,7 +66,7 @@
                        ",'" + binf.getBattProducer() + "','" + binf.getBattModel() + "','" + DAOHelper.sdf.format(binf.getBattProductDate()) + "','" + DAOHelper.sdf.format(binf.getBattInUseDate()) + "'," + binf.getLoad_curr() + "," + binf.getDisCurrMax() + ",'" + binf.getStation_phone() +
                        "'," + binf.getVol_grade() + ",'" + binf.getManufacturers() + "','" + binf.getAssetequipment() + "','" + binf.getDeviceclasspath() + "','" + binf.getDeviceoperationdepartment() + "','" + binf.getPropertyRightUnit() + "','" + binf.getPropertyAttribute() +
                        "','" + binf.getFactoryNumber() + "','" + binf.getOperationTeam() + "','" + binf.getDeviceIdentityCode() + "','" + binf.getProjectType() + "','" + binf.getBatteryApplicationType() + "'," + binf.getSingleRatedVoltage() + ",'" + binf.getRemoteMonitor() +
                        "','" + binf.getBatttIndependentPlaced() + "','" + binf.getJunChargeVoltageValue() + "','" + binf.getVideoUrl() +"','" + binf.getChargeType()+"'," + binf.getBuscoupleState()+","+binf.getTmp_id()+")";
                        "','" + binf.getBatttIndependentPlaced() + "','" + binf.getJunChargeVoltageValue() + "','" + binf.getVideoUrl() +"','" + binf.getChargeType()+"'," + binf.getBuscoupleState()+","+binf.getTmp_id()+","+binf.getPackCount()+")";
                sql_str.add(sql);
                String baoji_sql_main = "REPLACE into db_user.tb_user_battgroup_baojigroup_battgroup(baoji_group_id,StationId,BattGroupId) values('100011','" + binf.getStationId() + "'," + binf.getBattGroupId() + ")";
@@ -102,7 +102,7 @@
                        + " Load_curr=" + binf.getLoad_curr() + ",DisCurrMax=" + binf.getDisCurrMax() + ",station_phone='" + binf.getStation_phone() + "', FbsDeviceIp='" + binf.getFbsDeviceIp() + "',FbsDeviceIp_YM='" + binf.getFbsDeviceIp_YM() + "',FbsDeviceIp_WG='" + binf.getFbsDeviceIp_WG() + "' "
                        + ",Vol_grade=" + binf.getVol_grade() + ",Manufacturers='" + binf.getManufacturers() + "',Assetequipment='" + binf.getAssetequipment() + "',Deviceclasspath='" + binf.getDeviceclasspath() + "',Deviceoperationdepartment='" + binf.getDeviceoperationdepartment() + "',PropertyRightUnit='" + binf.getPropertyRightUnit() + "',PropertyAttribute='" + binf.getPropertyAttribute() + "',FactoryNumber='" + binf.getFactoryNumber() + "',OperationTeam='" + binf.getOperationTeam() + "' "
                        + ",DeviceIdentityCode='" + binf.getDeviceIdentityCode() + "',ProjectType='" + binf.getProjectType() + "',BatteryApplicationType='" + binf.getBatteryApplicationType() + "',SingleRatedVoltage=" + binf.getSingleRatedVoltage() + ",RemoteMonitor='" + binf.getRemoteMonitor() + "',BatttIndependentPlaced='" + binf.getBatttIndependentPlaced() + "',JunChargeVoltageValue='" + binf.getJunChargeVoltageValue() + "',video_url ='" + binf.getVideoUrl() + "',charge_type ='" + binf.getChargeType() + "',buscouple_state =" + binf.getBuscoupleState()
                        +",tmp_id="+binf.getTmp_id()+"  "
                        +",tmp_id="+binf.getTmp_id()+",PackCount="+binf.getPackCount()+"  "
                        +"  where battgroupId=" + binf.getBattGroupId();
                sql_str.add(sql);
                {
@@ -158,7 +158,7 @@
                + "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent,tmp_id " +
                ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,DisCurrMax,station_phone "
                + ",Vol_grade,Manufacturers,Assetequipment,Deviceclasspath,Deviceoperationdepartment,PropertyRightUnit,PropertyAttribute,FactoryNumber,OperationTeam "
                + ",DeviceIdentityCode,ProjectType,BatteryApplicationType,SingleRatedVoltage,RemoteMonitor,BatttIndependentPlaced,JunChargeVoltageValue,video_url,charge_type,buscouple_state  " +
                + ",DeviceIdentityCode,ProjectType,BatteryApplicationType,SingleRatedVoltage,RemoteMonitor,BatttIndependentPlaced,JunChargeVoltageValue,video_url,charge_type,buscouple_state,PackCount  " +
                " From db_battinf.tb_battinf " +
                " Where StationName1 like ? and StationName2 like ? and StationName5 like ? and StationName3 like ? " +
                " and StationId in (" +
@@ -229,6 +229,8 @@
                        binf.setVideoUrl(rs.getString("video_url"));
                        binf.setChargeType(rs.getInt("charge_type"));
                        binf.setBuscoupleState(rs.getInt("buscouple_state"));
                        binf.setPackCount(rs.getInt("PackCount"));
                        list.add(binf);
                    }
src/com/fgkj/dto/BattInf.java
@@ -110,6 +110,7 @@
    private String publicKeyY; //做设备校验时的标识
    private int tmp_id;
    private int packCount; //锂电池包数量
    /**追加链接 LD9升级表*/
    private LD9UpdateStatus ld9UpdateStatus;
@@ -796,6 +797,14 @@
        this.ld9UpdateStatus = ld9UpdateStatus;
    }
    public int getPackCount() {
        return packCount;
    }
    public void setPackCount(int packCount) {
        this.packCount = packCount;
    }
    @Override
    public String toString() {
        return "BattInf [num=" + num + ", StationId=" + StationId