修改逆变器和风机批量添加BUG

ipfcst-console/src/main/frontend/views/console/inverterInfo/index.vue

@@ -455,6 +455,7 @@
                           type: 'success'
                         })
                         this.loadButton = false
+                        this.piadd = false
                         this.getData()
                       }).catch((error) => {
                         this.$refs.xTable.setActiveRow(row)

ipfcst-console/src/main/frontend/views/console/windTurbineInfo/index.vue

@@ -545,6 +545,7 @@ export default {
                   this.btnLonding = false
                   this.getAll()
                   this.saveLoding = false
+                  this.piadd = false
                 }).catch((error) => {
                   this.$refs.xTable.setActiveRow(row)
                   this.$message.error('保存风机出错' + error)

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/InverterInfoService.java

@@ -60,31 +60,28 @@ public class InverterInfoService extends BaseService {
     @Transactional(propagation = Propagation.SUPPORTS)
     public void addALL(InverterInfo inverterInfo, Integer startValue, Integer endValue) throws BusinessException {
         for (int i = startValue; i < startValue + endValue; i++) {
-            InverterInfo inverterInfo1 = new InverterInfo();
-            inverterInfo1.setManufacturer(inverterInfo.getManufacturer());
-            inverterInfo1.setReport(inverterInfo.getReport());
-            inverterInfo1.setInstallationTime(inverterInfo.getInstallationTime());
-            inverterInfo1.setName(inverterInfo.getName() + "-" + i);
-            inverterInfo1.setBatteryModel(inverterInfo.getBatteryModel());
-            inverterInfo1.setBatteryNumber(inverterInfo.getBatteryNumber());
-            inverterInfo1.setBox(inverterInfo.getBox());
-            inverterInfo1.setCapacity(inverterInfo.getCapacity());
-            inverterInfo1.setCollectorCircuit(inverterInfo.getCollectorCircuit());
-            inverterInfo1.setEfficiency(inverterInfo.getEfficiency());
-            inverterInfo1.setGroupSeries(inverterInfo.getGroupSeries());
-            inverterInfo1.setSample(inverterInfo.getSample());
-            inverterInfo1.setModelNumber(inverterInfo.getModelNumber());
-            inverterInfo1.setInterval(inverterInfo.getInterval());
-            this.inverterInfoRepository.save(inverterInfo1);
+          InverterInfo inverterInfo1 = new InverterInfo();
+          inverterInfo1.setManufacturer(inverterInfo.getManufacturer());
+          inverterInfo1.setReport(inverterInfo.getReport());
+          inverterInfo1.setInstallationTime(inverterInfo.getInstallationTime());
+          inverterInfo1.setName(inverterInfo.getName() + "-" + i);
+          inverterInfo1.setBatteryModel(inverterInfo.getBatteryModel());
+          inverterInfo1.setBatteryNumber(inverterInfo.getBatteryNumber());
+          inverterInfo1.setBox(inverterInfo.getBox());
+          inverterInfo1.setCapacity(inverterInfo.getCapacity());
+          inverterInfo1.setCollectorCircuit(inverterInfo.getCollectorCircuit());
+          inverterInfo1.setEfficiency(inverterInfo.getEfficiency());
+          inverterInfo1.setGroupSeries(inverterInfo.getGroupSeries());
+          inverterInfo1.setSample(inverterInfo.getSample());
+          inverterInfo1.setModelNumber(inverterInfo.getModelNumber());
+          inverterInfo1.setInterval(inverterInfo.getInterval());
+          inverterInfo1.setStationCode(inverterInfo.getStationCode());
+          inverterInfo1.setEquipmentNo(inverterInfo.getEquipmentNo());
+          inverterInfo1.setBackupA(inverterInfo.getBackupA());
+          inverterInfo1.setBackupB(inverterInfo.getBackupB());
+          inverterInfo1.setBackupC(inverterInfo.getBackupC());
+          this.inverterInfoRepository.save(inverterInfo1);
         }
-
-
-//        boolean b = this.inverterRepository.existsById(inverter.getNo());
-//        if (b) {// 逆变器编号已存在
-//            throw new BusinessException("逆变器编号已存在!");
-//        } else {
-//
-//        }
     }
 
     /**
@@ -155,21 +152,21 @@ public class InverterInfoService extends BaseService {
     }*/
 
 
-    /**
-     * 查询逆变器【分页查询】
-     *
-     * @param page 页码
-     * @param size 每页记录数
-     * @return 分页结果
-     */
-    @Transactional(propagation = Propagation.NOT_SUPPORTED, readOnly = true)
-    public Page<InverterInfo> get(final InverterInfo inverterInfo, final Integer page, final Integer size) {
-      ExampleMatcher matcher =
-        ExampleMatcher.matching().withMatcher("modelNumber", ExampleMatcher.GenericPropertyMatchers.contains());
-      Example<InverterInfo> example = Example.of(inverterInfo, matcher);
-      Pageable pageable = PageRequest.of(page - 1, size);
-      return this.inverterInfoRepository.findAll(example, pageable);
-    }
+  /**
+   * 查询逆变器【分页查询】
+   *
+   * @param page 页码
+   * @param size 每页记录数
+   * @return 分页结果
+   */
+  @Transactional(propagation = Propagation.NOT_SUPPORTED, readOnly = true)
+  public Page<InverterInfo> get(final InverterInfo inverterInfo, final Integer page, final Integer size) {
+    ExampleMatcher matcher =
+      ExampleMatcher.matching().withMatcher("modelNumber", ExampleMatcher.GenericPropertyMatchers.contains());
+    Example<InverterInfo> example = Example.of(inverterInfo, matcher);
+    Pageable pageable = PageRequest.of(page - 1, size);
+    return this.inverterInfoRepository.findAll(example, pageable);
+  }
 
     /**
      * 查询逆变器【分页查询】

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/WindTurbineInfoService.java

@@ -132,7 +132,8 @@ public class WindTurbineInfoService extends BaseService {
         ExampleMatcher matcher =
                 ExampleMatcher.matching().withMatcher("modelNumber", ExampleMatcher.GenericPropertyMatchers.contains());
         Example<WindTurbineInfo> example = Example.of(windTurbine, matcher);
-        Pageable pageable = PageRequest.of(page - 1, size);
+        Sort sort = Sort.by(Sort.Direction.ASC,"stationCode");
+        Pageable pageable = PageRequest.of(page - 1, size,sort);
         return this.windTurbineInfoRepository.findAll(example, pageable);
     }
 
@@ -207,6 +208,13 @@ public class WindTurbineInfoService extends BaseService {
       windTurbineInfo1.setWindWheelRatedSpeed(windTurbineInfo.getWindWheelRatedSpeed());
       windTurbineInfo1.setWindWheelMinSpeed(windTurbineInfo.getWindWheelMinSpeed());
       windTurbineInfo1.setInterval(windTurbineInfo.getInterval());
+      windTurbineInfo1.setStationCode(windTurbineInfo.getStationCode());
+      windTurbineInfo1.setEquipmentNo(windTurbineInfo.getEquipmentNo());
+      windTurbineInfo1.setLatitude(windTurbineInfo.getLatitude());
+      windTurbineInfo1.setLongitude(windTurbineInfo.getLongitude());
+      windTurbineInfo1.setCollectorCircuit(windTurbineInfo.getCollectorCircuit());
+      windTurbineInfo1.setBackupA(windTurbineInfo.getBackupA());
+      windTurbineInfo1.setBackupB(windTurbineInfo.getBackupB());
       this.windTurbineInfoRepository.save(windTurbineInfo1);
     }