切出风速，机组信息，风速点表页面完善

ipfcst/ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/repository/WindSpeedPointInfoRepository.java

@@ -6,7 +6,10 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.lang.Nullable;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -17,4 +20,8 @@ import java.util.List;
 public interface WindSpeedPointInfoRepository extends JpaRepository<WindSpeedPointInfo, Integer>, JpaSpecificationExecutor<WindSpeedPointInfo> {
     Page<WindSpeedPointInfo> findBySpeedContaining(float speed, Pageable pageable);
 
+    @Transactional
+    @Modifying
+    @Query(value = "truncate table t_wind_speed_point_info",nativeQuery = true)
+    public void truncateTable();
 }

ipfcst/ipfcst-reportquery/src/main/frontend/views/parameterConfiguration/CutOutSpeedSpecifyInfo/index.vue

@@ -15,7 +15,6 @@
         :show-file-list = false
       >
         <el-button size="small" type="primary" >读取excel</el-button>
-
       </el-upload>
       </el-row>
       <div>
@@ -28,11 +27,6 @@
           element-loading-background="rgba(0, 0, 0, 0.8)"
           style="width: 100%">
           <el-table-column
-            prop="id"
-            label="id"
-          >
-          </el-table-column>
-          <el-table-column
             prop="lowerWindSpeedLimit"
             label="发电风速下限"
           >
@@ -48,7 +42,7 @@
           >
           </el-table-column>
           <el-table-column
-            prop="unitBelongs"
+            prop="fanId"
             label="所属机组"
           >
           </el-table-column>
@@ -96,7 +90,7 @@
               <el-input v-model="form.powerGeneration" style="width: 70%"></el-input>
             </el-form-item>
             <el-form-item label="所属机组" prop="unitBelongs">
-              <el-input v-model="form.unitBelongs" style="width: 70%"></el-input>
+              <el-input v-model="form.fanId" style="width: 70%"></el-input>
             </el-form-item>
 
           </el-form>

ipfcst/ipfcst-reportquery/src/main/frontend/views/parameterConfiguration/FanUnitInfo/index.vue

@@ -4,7 +4,6 @@
       <div slot="header" class="clearfix">
         <span>机组信息</span>
       </div>
-
       <el-row>
         <el-button type="primary" size="small" @click="insertEvent" >新增</el-button>
         <el-upload
@@ -16,11 +15,8 @@
           :show-file-list = false
         >
           <el-button size="small" type="primary" >读取excel</el-button>
-
         </el-upload>
-
       </el-row>
-
       <div>
         <el-table
           :data="tableData"
@@ -31,8 +27,8 @@
           border
           >
           <el-table-column
-            prop="id"
-            label="id"
+            prop="fanId"
+            label="序号"
           >
           </el-table-column>
           <el-table-column
@@ -79,19 +75,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <!--    分页-->
         <div style="margin-top: 10px;">
-<!--            <el-pagination-->
-<!--              @size-change="handleSizeChange"-->
-<!--              @current-change="handleCurrentChange"-->
-<!--              :current-page="currentPage"-->
-<!--              :page-sizes="[10, 20, 50,]"-->
-<!--              :page-size="pageSize"-->
-<!--              layout="total, sizes, prev, pager, next, jumper"-->
-<!--              :total="total"-->
-<!--            >-->
-<!--            </el-pagination>-->
-
           <div class="rtPageturning">
             <vxe-pager
               background
@@ -109,6 +93,9 @@
           width="30%"
         >
           <el-form ref="form" :model="form" label-width="120px" :rules="rules">
+            <el-form-item label="机组序号" prop="fanId">
+              <el-input v-model="form.fanId" style="width: 70%" ></el-input>
+            </el-form-item>
             <el-form-item label="机组品牌名称" prop="fanName">
               <el-input v-model="form.fanName" style="width: 70%" ></el-input>
             </el-form-item>
@@ -160,6 +147,9 @@ export default {
       total: 0,
       loading: false,
       rules: {
+        fanId: [
+          {required: true, message: '不能为空'},
+        ],
         fanName: [
           {required: true, message: '不能为空'},
         ],
@@ -212,7 +202,6 @@ export default {
       this.initPage()
     },
     handleEdit(index, row) {
-      console.log(index, row);
       this.form = JSON.parse(JSON.stringify(row))
       this.dialogVisible = true
       this.initPage()

ipfcst/ipfcst-reportquery/src/main/frontend/views/parameterConfiguration/WindSpeedPointInfo/index.vue

@@ -87,17 +87,12 @@
         <el-table
           :data="tableData"
           v-loading="loading"
-          element-loading-text="拼命加载中..."
+          element-loading-text="风速点表数据量过大，读取需要一分钟左右，请耐心等待，读取期间请勿进行其他操作，此文字消失则代表读取结束。。。 "
           element-loading-spinner="el-icon-loading"
           element-loading-background="rgba(0, 0, 0, 0.8)"
           border
           style="width: 100%">
           <el-table-column
-            prop="id"
-            label="id"
-          >
-          </el-table-column>
-          <el-table-column
             prop="fanNumber"
             label="风机编号"
           >
@@ -161,7 +156,7 @@
             <el-form-item label="风向" prop="wind">
               <el-input v-model="form.wind" style="width: 70%"></el-input>
             </el-form-item>
-            <el-form-item label="风速 MW" prop="speed">
+            <el-form-item label="风速" prop="speed">
               <el-input v-model="form.speed" style="width: 70%"></el-input>
             </el-form-item>
             <el-form-item label="所属机组" prop="unitBelongs">

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/controller/ReadToMysqlController.java

@@ -41,7 +41,8 @@ public class ReadToMysqlController {
   }
 
   /**
-   * 读取切除
+   * 读取切出
+   *
    * @return
    */
   @PostMapping("/cutOutSpeedSpecifyInfo")
@@ -63,7 +64,7 @@ public class ReadToMysqlController {
   public ResponseVO getSpeedSheet(@RequestParam("multipartFile") MultipartFile multipartFile){
     try {
       if(windSpeedPointInfoRepository.findAll().size() > 0){
-        windSpeedPointInfoRepository.deleteAll();
+        windSpeedPointInfoRepository.truncateTable();
       }
       return readToMysqlService.readSpeedSheet(multipartFile);
     } catch (Exception e) {

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/service/ReadToMysqlService.java

@@ -10,6 +10,7 @@ import com.jiayue.ipfcst.common.data.entity.CutOutSpeedSpecifyInfo;
 import com.jiayue.ipfcst.common.data.entity.FanUnitInfo;
 import com.jiayue.ipfcst.common.data.entity.WindSpeedPointInfo;
 import com.jiayue.ipfcst.common.data.entity.WindTurbinePowerCurve;
+import com.jiayue.ipfcst.common.data.repository.CutOutSpeedSpecifyInfoRepository;
 import com.jiayue.ipfcst.common.data.repository.FanUnitInfoRepository;
 import com.jiayue.ipfcst.common.data.repository.WindSpeedPointInfoRepository;
 import com.jiayue.ipfcst.common.data.repository.WindTurbinePowerCurveRepository;
@@ -30,17 +31,20 @@ import java.util.*;
  */
 @Service
 public class ReadToMysqlService extends BaseService {
-  private static WindSpeedPointInfoRepository windSpeedPointInfoRepository;
-  private static WindTurbinePowerCurveRepository windTurbinePowerCurveRepository;
-  private static FanUnitInfoRepository fanUnitInfoRepository;
+  private WindSpeedPointInfoRepository windSpeedPointInfoRepository;
+  private WindTurbinePowerCurveRepository windTurbinePowerCurveRepository;
+  private FanUnitInfoRepository fanUnitInfoRepository;
+  private CutOutSpeedSpecifyInfoRepository cutOutSpeedSpecifyInfoRepository;
 
   @Autowired
   public ReadToMysqlService(WindSpeedPointInfoRepository windSpeedPointInfoRepository,
-                                              FanUnitInfoRepository fanUnitInfoRepository,
-                                              WindTurbinePowerCurveRepository windTurbinePowerCurveRepository) {
+                            FanUnitInfoRepository fanUnitInfoRepository,
+                            WindTurbinePowerCurveRepository windTurbinePowerCurveRepository,
+                            CutOutSpeedSpecifyInfoRepository cutOutSpeedSpecifyInfoRepository) {
     this.windSpeedPointInfoRepository = windSpeedPointInfoRepository;
     this.fanUnitInfoRepository = fanUnitInfoRepository;
     this.windTurbinePowerCurveRepository = windTurbinePowerCurveRepository;
+    this.cutOutSpeedSpecifyInfoRepository = cutOutSpeedSpecifyInfoRepository;
   }
 
 
@@ -49,8 +53,7 @@ public class ReadToMysqlService extends BaseService {
    *
    * @return
    */
-  public static ResponseVO readFanUnitInfo(MultipartFile multipartFile) throws Exception {
-    // 机组信息读取 sheet 0
+  public ResponseVO readFanUnitInfo(MultipartFile multipartFile) throws Exception {
     try (
       ExcelReader reader = ExcelUtil.getReader(multipartFile.getInputStream(), 0)) {
       reader.addHeaderAlias("序号", "fanId");
@@ -72,7 +75,7 @@ public class ReadToMysqlService extends BaseService {
   /**
    * 读取  8个风向 sheet表风速点表
    */
-  public static ResponseVO readSpeedSheet(MultipartFile multipartFile){
+  public ResponseVO readSpeedSheet(MultipartFile multipartFile){
     Map<Integer, List<String>> fanidInfo = new HashMap<>();
     List<WindSpeedPointInfo> windSpeedPointInfoList = new ArrayList<>();
     DecimalFormat decimalFormat = new DecimalFormat(".00");
@@ -136,7 +139,7 @@ public class ReadToMysqlService extends BaseService {
   /**
    * 读取风速曲线
    */
-  public static ResponseVO readWindTurbinePowerCurveMap(MultipartFile multipartFile) throws Exception {
+  public ResponseVO readWindTurbinePowerCurveMap(MultipartFile multipartFile) throws Exception {
     for (int sheelIndex = 10; sheelIndex <= 14; sheelIndex++) {
       //读取风速曲线 sheet
       String sheetName;
@@ -171,24 +174,15 @@ public class ReadToMysqlService extends BaseService {
    *
    * @return
    */
-  public static ResponseVO readFanCutOutSpeedInfo(MultipartFile multipartFile) throws SQLException, IOException {
-    List<CutOutSpeedSpecifyInfo> cutOutSpeedSpecifyInfoList;
+  public ResponseVO readFanCutOutSpeedInfo(MultipartFile multipartFile) throws SQLException, IOException {
     try (ExcelReader reader = ExcelUtil.getReader(multipartFile.getInputStream(), 9)) {
       reader.addHeaderAlias("序号", "id");
       reader.addHeaderAlias("风速下限(包含)m/s", "lowerWindSpeedLimit");
       reader.addHeaderAlias("风速上限(不包含)m/s", "highWindSpeedLimit");
       reader.addHeaderAlias("发电功率kW", "powerGeneration");
-      reader.addHeaderAlias("所属机组", "UnitBelongs");
-      cutOutSpeedSpecifyInfoList = reader.readAll(CutOutSpeedSpecifyInfo.class);
-      for (CutOutSpeedSpecifyInfo cs : cutOutSpeedSpecifyInfoList) {
-        Db.use().insertForGeneratedKey(
-          Entity.create("t_cut_out_speed_specify_info")
-            .set("C_LOWER_WIND_SPEED_LIMIT", cs.getLowerWindSpeedLimit())
-            .set("C_HIGH_WIND_SPEED_LIMIT", cs.getHighWindSpeedLimit())
-            .set("C_POWER_GENERATION", cs.getPowerGeneration())
-            .set("C_UNIT_BELONGS", cs.getFanId())
-        );
-      }
+      reader.addHeaderAlias("所属机组", "fanId");
+      List<CutOutSpeedSpecifyInfo> cutOutSpeedSpecifyInfoList = reader.readAll(CutOutSpeedSpecifyInfo.class);
+      cutOutSpeedSpecifyInfoRepository.saveAll(cutOutSpeedSpecifyInfoList);
     } catch (cn.hutool.poi.exceptions.POIException e) {
       return ResponseVO.error(e);
     }