调控记录增加上报状态

cpp-admin/src/main/java/com/cpp/web/controller/regulation/DqRegulationController.java

@@ -16,6 +16,7 @@ import com.cpp.web.domain.accuracy.AccuracyPassRate;
 import com.cpp.web.domain.enums.DataSourcesEnum;
 import com.cpp.web.domain.enums.ForecastTypeEnum;
 import com.cpp.web.domain.enums.RegulationStatusEnum;
+import com.cpp.web.domain.enums.UploadStatusEnum;
 import com.cpp.web.domain.regulation.TempShortRegulation;
 import com.cpp.web.domain.regulation.TempShortRegulationDetail;
 import com.cpp.web.domain.regulation.TempShortUsual;
@@ -235,6 +236,8 @@ public class DqRegulationController {
         tempShortRegulation.setCreateBy(loginUser.getUsername());
         // 设置未下发
         tempShortRegulation.setRegulationStatusEnum(RegulationStatusEnum.E2.name());
+        // 设置未回传
+        tempShortRegulation.setUploadStatusEnum(UploadStatusEnum.E3.name());
         tempShortRegulationService.save(tempShortRegulation);
 
         // 封装新的调控明细插入数据
@@ -353,7 +356,7 @@ public class DqRegulationController {
             map.put("stationCode", tempShortRegulation.getStationCode());
             map.put("forecastDate", DateUtil.format(tempShortRegulation.getForecastDate(), "yyyy-MM-dd"));
             map.put("regulationStatusEnum", RegulationStatusEnum.valueOf(tempShortRegulation.getRegulationStatusEnum()).getMessage());
-            map.put("sbzt", "成功");
+            map.put("uploadStatusEnum", UploadStatusEnum.valueOf(tempShortRegulation.getUploadStatusEnum()).getMessage());
             // 根据账号获取昵称
             Optional<SysUser> sysUserOptional = sysUserList.stream().filter(sysUser -> sysUser.getUserName().equals(tempShortRegulation.getCreateBy())).findFirst();
             if (sysUserOptional.isPresent()) {

cpp-ui/src/views/regulation/dqRegulationRecord/index.vue

@@ -46,7 +46,7 @@
         <vxe-table-column field="stationCode" title="调控场站" :formatter="stationCodeFormat"></vxe-table-column>
         <vxe-table-column field="forecastDate" title="上报预测日期"></vxe-table-column>
         <vxe-table-column field="regulationStatusEnum" title="调控下发状态"></vxe-table-column>
-        <vxe-table-column field="sbzt" title="上报状态"></vxe-table-column>
+        <vxe-table-column field="uploadStatusEnum" title="上报状态"></vxe-table-column>
         <vxe-table-column field="createBy" title="调控人"></vxe-table-column>
         <vxe-table-column field="voltage" title="策略查看">
           <template slot-scope="scope">
@@ -93,12 +93,6 @@ export default {
     }
   },
   created(){
-    // 获取所有逆变器名称(列表转义应用)
-    this.$axios.get('/inverterinfo/findAll').then((res) => {
-      this.nameList = res.data
-    }).catch((error) => {
-      this.$message.error('获取逆变器转义名称出错' + error)
-    })
     // 获取场站下拉列表
     this.getStationCode()
   },