实时预测一期二期页面修改

ipfcst/ipfcst-reportquery/src/main/frontend/views/contrastRealTimeQueryOne/index.vue

@@ -22,17 +22,6 @@
         </el-date-picker>
       </div>
       <div>
-        <span class="timeText">设备编号</span>
-        <el-select v-model="equipmentId" placeholder="请选择">
-          <el-option
-            v-for="item in equipments"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </div>
-      <div>
         <span class="timeText">间隔时间</span>
         <el-select v-model="jgTime" placeholder="请选择" @change="changeJgTime">
           <el-option
@@ -249,8 +238,6 @@ export default {
       const formData = new FormData()
       formData.append("startTime",this.startTime)
       formData.append("endTime",this.endTime)
-      formData.append("no",this.equipmentId)
-      formData.append("otherType",this.electricField.electricFieldTypeEnum)
       formData.append("jgTime",this.jgTime)
       formData.append("base64",this.base64)
       //this.$axios.get('ComprehensiveContrastExports/' + this.startTime + '/' + this.endTime + '/' + this.equipmentId + '/' + this.electricField.electricFieldTypeEnum + '/' + this.jgTime+ '/' +this.base64+ '/' +this.width+ '/' +this.height, {
@@ -327,24 +314,8 @@ export default {
       })
     },
     getEquipments(eType) {
-      var url = '/weatherStationInfos'
-      this.displayConfig.displayCode = "rtWeatherStationInfos"
-      //枚举类型E1光伏  E2风电
-      if (eType == 'E2') {
-        url = '/windTowerInfos'
-        this.displayConfig.displayCode = 'rtWindTowerInfos'
-      }
-      this.$axios.get(url).then((res) => {
-        this.equipments = res.data
-        if (res.data != null && res.data.length > 0) {
-          this.equipmentId = this.equipments[0].id
-          this.getDisplay()
-        } else {
-          this.$message.warning("设备信息未维护")
-        }
-      }).catch((error) => {
-        this.$message.error('查询设备信息出错' + error)
-      })
+      this.displayConfig.displayCode = 'rtWindTowerInfos'
+      this.getDisplay()
     },
     initDisplay() {
         this.lists.push({key:'实际功率(MW)',value:'realValue'})
@@ -443,7 +414,7 @@ export default {
       if (isNaN(this.nwpAgo)) {
         this.nwpAgo = 1
       }
-      this.$axios.get('realTimeComprehensiveContrastOne/' + startTime + '/' + endTime + '/' + this.equipmentId + '/' + this.electricField.electricFieldTypeEnum + '/' + this.jgTime).then((res) => {
+      this.$axios.get('realTimeComprehensiveContrastOne/' + startTime + '/' + endTime + '/'  + this.jgTime).then((res) => {
 
         this.tableColumn = [
           { field: 'times', title: '时间', width:200},

ipfcst/ipfcst-reportquery/src/main/frontend/views/contrastRealTimeQueryTwo/index.vue

@@ -22,17 +22,6 @@
         </el-date-picker>
       </div>
       <div>
-        <span class="timeText">设备编号</span>
-        <el-select v-model="equipmentId" placeholder="请选择">
-          <el-option
-            v-for="item in equipments"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </div>
-      <div>
         <span class="timeText">间隔时间</span>
         <el-select v-model="jgTime" placeholder="请选择" @change="changeJgTime">
           <el-option
@@ -249,8 +238,6 @@ export default {
       const formData = new FormData()
       formData.append("startTime",this.startTime)
       formData.append("endTime",this.endTime)
-      formData.append("no",this.equipmentId)
-      formData.append("otherType",this.electricField.electricFieldTypeEnum)
       formData.append("jgTime",this.jgTime)
       formData.append("base64",this.base64)
       //this.$axios.get('ComprehensiveContrastExports/' + this.startTime + '/' + this.endTime + '/' + this.equipmentId + '/' + this.electricField.electricFieldTypeEnum + '/' + this.jgTime+ '/' +this.base64+ '/' +this.width+ '/' +this.height, {
@@ -327,24 +314,8 @@ export default {
       })
     },
     getEquipments(eType) {
-      var url = '/weatherStationInfos'
-      this.displayConfig.displayCode = "rtWeatherStationInfos"
-      //枚举类型E1光伏  E2风电
-      if (eType == 'E2') {
-        url = '/windTowerInfos'
-        this.displayConfig.displayCode = 'rtWindTowerInfos'
-      }
-      this.$axios.get(url).then((res) => {
-        this.equipments = res.data
-        if (res.data != null && res.data.length > 0) {
-          this.equipmentId = this.equipments[0].id
-          this.getDisplay()
-        } else {
-          this.$message.warning("设备信息未维护")
-        }
-      }).catch((error) => {
-        this.$message.error('查询设备信息出错' + error)
-      })
+      this.displayConfig.displayCode = 'rtWindTowerInfos'
+      this.getDisplay()
     },
     initDisplay() {
         this.lists.push({key:'实际功率(MW)',value:'realValue'})
@@ -443,7 +414,7 @@ export default {
       if (isNaN(this.nwpAgo)) {
         this.nwpAgo = 1
       }
-      this.$axios.get('realTimeComprehensiveContrastTwo/' + startTime + '/' + endTime + '/' + this.equipmentId + '/' + this.electricField.electricFieldTypeEnum + '/' + this.jgTime).then((res) => {
+      this.$axios.get('realTimeComprehensiveContrastTwo/' + startTime + '/' + endTime + '/' + this.jgTime).then((res) => {
 
         this.tableColumn = [
           { field: 'times', title: '时间', width:200},

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

@@ -55,18 +55,15 @@ public class RealTimeComprehensiveContrastOneController {
    *
    * @param startTime 开始时间
    * @param endTime   结束时间
-   * @param no
    * @return
    */
-  @GetMapping(value = "realTimeComprehensiveContrastOne/{startTime}/{endTime}/{no}/{otherType}/{jgTime}")
+  @GetMapping(value = "realTimeComprehensiveContrastOne/{startTime}/{endTime}/{jgTime}")
   public ResponseVO realTimeComprehensiveQueryForcharts(@PathVariable("startTime") Long startTime,
                                                         @PathVariable("endTime") Long endTime,
-                                                        @PathVariable("no") Integer no,
-                                                        @PathVariable("otherType") String otherType,
                                                         @PathVariable("jgTime") Long jgTime
 
   ) throws Exception {
-    return ResponseVO.success(realTimeComprehensiveContrastOneService.realTimeComprehensiveContrast(startTime, endTime, no, otherType, jgTime));
+    return ResponseVO.success(realTimeComprehensiveContrastOneService.realTimeComprehensiveContrast(startTime, endTime, jgTime));
   }
 
 
@@ -75,20 +72,17 @@ public class RealTimeComprehensiveContrastOneController {
    *
    * @param startTime 开始时间
    * @param endTime   结束时间
-   * @param no
    * @return
    */
-  @GetMapping(value = "realTimeComprehensiveContrastOneExport/{startTime}/{endTime}/{no}/{otherType}/{jgTime}")
+  @GetMapping(value = "realTimeComprehensiveContrastOneExport/{startTime}/{endTime}/{jgTime}")
   public ResponseVO export(@PathVariable("startTime") Long startTime,
                            @PathVariable("endTime") Long endTime,
-                           @PathVariable("no") Integer no,
-                           @PathVariable("otherType") String otherType,
                            @PathVariable("jgTime") Long jgTime,
                            HttpServletResponse response
 
   ) throws Exception {
 
-    Map<String, Object> map = realTimeComprehensiveContrastOneService.realTimeComprehensiveContrast(startTime, endTime, no, otherType, jgTime);
+    Map<String, Object> map = realTimeComprehensiveContrastOneService.realTimeComprehensiveContrast(startTime, endTime, jgTime);
 
     BufferedOutputStream bos = null;
     try {
@@ -165,8 +159,6 @@ public class RealTimeComprehensiveContrastOneController {
   @PostMapping(value = "/ComprehensiveContrastOneExports")
   public ResponseVO exportExcelForImg(Long startTime,
                                       Long endTime,
-                                      Integer no,
-                                      String otherType,
                                       Long jgTime,
                                       String base64) throws Exception {
     //创建Excel工作簿，xls格式用HSSFWorkbook，xlsx格式用SXSSFWorkbook
@@ -180,7 +172,7 @@ public class RealTimeComprehensiveContrastOneController {
     fileContent = URLDecoder.decode(base64, "UTF-8").substring(22);
 
     //#########################插入数据#########################
-    Map<String, Object> map = realTimeComprehensiveContrastOneService.realTimeComprehensiveContrast(startTime, endTime, no, otherType, jgTime);
+    Map<String, Object> map = realTimeComprehensiveContrastOneService.realTimeComprehensiveContrast(startTime, endTime, jgTime);
     BufferedOutputStream bos = null;
     StringBuilder templateContent = new StringBuilder();
     ElectricField electricField = electricFieldService.get();

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

@@ -55,18 +55,15 @@ public class RealTimeComprehensiveContrastTwoController {
    *
    * @param startTime 开始时间
    * @param endTime   结束时间
-   * @param no
    * @return
    */
-  @GetMapping(value = "realTimeComprehensiveContrastTwo/{startTime}/{endTime}/{no}/{otherType}/{jgTime}")
+  @GetMapping(value = "realTimeComprehensiveContrastTwo/{startTime}/{endTime}/{jgTime}")
   public ResponseVO realTimeComprehensiveQueryForcharts(@PathVariable("startTime") Long startTime,
                                                         @PathVariable("endTime") Long endTime,
-                                                        @PathVariable("no") Integer no,
-                                                        @PathVariable("otherType") String otherType,
                                                         @PathVariable("jgTime") Long jgTime
 
   ) throws Exception {
-    return ResponseVO.success(realTimeComprehensiveContrastTwoService.realTimeComprehensiveContrast(startTime, endTime, no, otherType, jgTime));
+    return ResponseVO.success(realTimeComprehensiveContrastTwoService.realTimeComprehensiveContrast(startTime, endTime, jgTime));
   }
 
 
@@ -75,20 +72,17 @@ public class RealTimeComprehensiveContrastTwoController {
    *
    * @param startTime 开始时间
    * @param endTime   结束时间
-   * @param no
    * @return
    */
-  @GetMapping(value = "realTimeComprehensiveContrastTwoExport/{startTime}/{endTime}/{no}/{otherType}/{jgTime}")
+  @GetMapping(value = "realTimeComprehensiveContrastTwoExport/{startTime}/{endTime}/{jgTime}")
   public ResponseVO export(@PathVariable("startTime") Long startTime,
                            @PathVariable("endTime") Long endTime,
-                           @PathVariable("no") Integer no,
-                           @PathVariable("otherType") String otherType,
                            @PathVariable("jgTime") Long jgTime,
                            HttpServletResponse response
 
   ) throws Exception {
 
-    Map<String, Object> map = realTimeComprehensiveContrastTwoService.realTimeComprehensiveContrast(startTime, endTime, no, otherType, jgTime);
+    Map<String, Object> map = realTimeComprehensiveContrastTwoService.realTimeComprehensiveContrast(startTime, endTime, jgTime);
 
     BufferedOutputStream bos = null;
     try {
@@ -166,8 +160,6 @@ public class RealTimeComprehensiveContrastTwoController {
   @PostMapping(value = "/ComprehensiveContrastTwoExports")
   public ResponseVO exportExcelForImg(Long startTime,
                                       Long endTime,
-                                      Integer no,
-                                      String otherType,
                                       Long jgTime,
                                       String base64) throws Exception {
     //创建Excel工作簿，xls格式用HSSFWorkbook，xlsx格式用SXSSFWorkbook
@@ -181,7 +173,7 @@ public class RealTimeComprehensiveContrastTwoController {
     fileContent = URLDecoder.decode(base64, "UTF-8").substring(22);
 
     //#########################插入数据#########################
-    Map<String, Object> map = realTimeComprehensiveContrastTwoService.realTimeComprehensiveContrast(startTime, endTime, no, otherType, jgTime);
+    Map<String, Object> map = realTimeComprehensiveContrastTwoService.realTimeComprehensiveContrast(startTime, endTime, jgTime);
     BufferedOutputStream bos = null;
     StringBuilder templateContent = new StringBuilder();
     ElectricField electricField = electricFieldService.get();

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

@@ -29,13 +29,10 @@ public class RealTimeComprehensiveContrastOneService extends BaseService {
 
   public Map<String, Object> realTimeComprehensiveContrast(Long startTime,
                                                            Long endTime,
-                                                           Integer no,
-                                                           String otherType,
                                                            Long jgTime) throws BusinessException {
     Map<String, Object> map = new HashMap<>();
     Map<String, Object> rpMap = new HashMap<>();
     Map<String, Object> rDqMap = new HashMap<>();
-    List<WindTowerStatusData> windTowerStatusDataList = new ArrayList<>();
 
     rpMap = powerStationStatusDataService.findByTimeBetweenForContrast(new Date(startTime), new Date(endTime), jgTime);
 
@@ -51,7 +48,6 @@ public class RealTimeComprehensiveContrastOneService extends BaseService {
     String displayKyLl = "0";
     DisplayConfig displayConfig = displayConfigService.findByDisplayCode("rtWindTowerInfos");
     for (int i = 0; i < times.size(); i++) {
-      Map<String, Object> resultMap = new HashMap<>();
 
       Map<String, Object> dtoMap = new HashMap<>();
       //

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

@@ -29,8 +29,6 @@ public class RealTimeComprehensiveContrastTwoService extends BaseService {
 
   public Map<String, Object> realTimeComprehensiveContrast(Long startTime,
                                                            Long endTime,
-                                                           Integer no,
-                                                           String otherType,
                                                            Long jgTime) throws BusinessException {
     Map<String, Object> map = new HashMap<>();
     Map<String, Object> rpMap = new HashMap<>();