放电计划

whycxzp

2023-03-16 e3d5a4753829e079026190ae7cd7f593f0ae32c2

放电计划

 src/main/java/com/whyc/pojo/Battinf.java

@@ -313,6 +313,10 @@
    private Integer nodeStation;
    @TableField("StationType")
    private String stationType;

    @TableField(exist = false)
    private String note;
    @TableField(exist = false)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date dischargeStartTime;
}

 src/main/java/com/whyc/service/BattdischargePlanService.java

@@ -501,8 +501,9 @@
                Battinf battinf = battStationList.get(j);
                if(battinf.getNodeStation()==1){
                    //找到节点
                    battinf.setBattInUseDate(planTime.getTime());
                    battinf.setDischargeStartTime(planTime.getTime());;
                    battinf.setNum(groupWithBattStationList.getBaojiGroupId());//记录计划内的组号
                    battinf.setInstallUser(groupWithBattStationList.getBaojiGroupName());
                    battinf.setNote(String.valueOf(i));//记录计划内的组号对应的索引
                    planList.add(battinf);
                    nodeStationExists = 1;
@@ -533,8 +534,9 @@
                for (int j = 0; j < battStationList.size(); j++) {
                    Battinf battinf = battStationList.get(j);
                    if(battinf.getNodeStation()==0){
                        battinf.setBattInUseDate(planTime.getTime());
                        battinf.setDischargeStartTime(planTime.getTime());;
                        battinf.setNum(groupWithBattStationList.getBaojiGroupId());//记录计划内的组号
                        battinf.setInstallUser(groupWithBattStationList.getBaojiGroupName());
                        battinf.setNote(String.valueOf(i));//记录计划内的组号对应的索引
                        planList.add(battinf);
                        //已经加入到计划组的,从原纪录中剔除
@@ -562,8 +564,9 @@
                    for (int j = 0; j < battStationList.size(); j++) {
                        Battinf battinf = battStationList.get(j);
                        if(battinf.getNodeStation()==0){
                            battinf.setBattInUseDate(planTime.getTime());
                            battinf.setDischargeStartTime(planTime.getTime());;
                            battinf.setNum(groupWithBattStationList.getBaojiGroupId());//记录计划内的组号
                            battinf.setInstallUser(groupWithBattStationList.getBaojiGroupName());
                            planList.add(battinf);
                            notNodeStationExists = 1;
                            //已经加入到计划组的,从原纪录中剔除
@@ -579,8 +582,9 @@
                        for (int j = 0; j < battStationList2.size(); j++) {
                            Battinf battinf = battStationList2.get(j);
                            if(battinf.getNodeStation()==0){
                                battinf.setBattInUseDate(planTime.getTime());
                                battinf.setDischargeStartTime(planTime.getTime());;
                                battinf.setNum(groupHavingNodeWithBattStationList.getBaojiGroupId());//记录计划内的组号
                                battinf.setInstallUser(groupHavingNodeWithBattStationList.getBaojiGroupName());
                                planList.add(battinf);
                                //已经加入到计划组的,从原纪录中剔除
                                battStationList.remove(j);
@@ -599,8 +603,9 @@
                    for (int j = 0; j < battStationList2.size(); j++) {
                        Battinf battinf = battStationList2.get(j);
                        if(battinf.getNodeStation()==0){
                            battinf.setBattInUseDate(planTime.getTime());
                            battinf.setDischargeStartTime(planTime.getTime());;
                            battinf.setNum(groupHavingNodeWithBattStationList.getBaojiGroupId());//记录计划内的组号
                            battinf.setInstallUser(groupHavingNodeWithBattStationList.getBaojiGroupName());
                            planList.add(battinf);
                            indexRemoveList.add(j);
                            if(planList.size()==3) {
@@ -624,8 +629,9 @@
                List<Integer> indexRemoveList = new LinkedList<>();
                for (int j = 0; j < battStationList.size(); j++) {
                    Battinf battinf = battStationList.get(j);
                    battinf.setBattInUseDate(planTime.getTime());
                    battinf.setDischargeStartTime(planTime.getTime());;
                    battinf.setNum(groupWithBattStationList.getBaojiGroupId());//记录计划内的组号
                    battinf.setInstallUser(groupWithBattStationList.getBaojiGroupName());
                    battinf.setNote(String.valueOf(i));//记录计划内的组号对应的索引
                    planList.add(battinf);
                    indexRemoveList.add(j);
@@ -654,8 +660,9 @@
                        for (int j = 0; j < battStationList.size(); j++) {
                            Battinf battinf = battStationList.get(j);
                            if (battinf.getNodeStation() == 0) {
                                battinf.setBattInUseDate(planTime.getTime());
                                battinf.setDischargeStartTime(planTime.getTime());;
                                battinf.setNum(groupWithBattStationList.getBaojiGroupId());//记录计划内的组号
                                battinf.setInstallUser(groupWithBattStationList.getBaojiGroupName());
                                planList.add(battinf);
                                indexRemoveList.add(j);
                                if(planList.size()==3){
@@ -677,8 +684,9 @@
                        for (int j = 0; j < battStationList.size(); j++) {
                            Battinf battinf = battStationList.get(j);
                            if (battinf.getNodeStation() == 0) {
                                battinf.setBattInUseDate(planTime.getTime());
                                battinf.setDischargeStartTime(planTime.getTime());;
                                battinf.setNum(groupWithBattStationList.getBaojiGroupId());//记录计划内的组号
                                battinf.setInstallUser(groupWithBattStationList.getBaojiGroupName());
                                planList.add(battinf);
                                //已经加入到计划组的,从原纪录中剔除
                                battStationList.remove(j);