Browse Source

程序移植

wanghc 3 years ago
parent
commit
264066fb31

+ 0 - 23
ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/constant/enums/ElectricFieldStatrsEnum.java

@@ -1,23 +0,0 @@
-package com.jiayue.ipfcst.common.data.constant.enums;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 场站状态枚举
- *
- * @author bizy
- * @version 3.0
- */
-@Getter
-@AllArgsConstructor
-@JsonFormat(shape = JsonFormat.Shape.OBJECT)
-public enum ElectricFieldStatrsEnum {
-	E1(1, "未运维"),
-
-	E2(2, "运维中");
-
-	private Integer code;
-	private String message;
-}

+ 0 - 52
ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/constant/enums/ProvinceEnum.java

@@ -1,52 +0,0 @@
-package com.jiayue.ipfcst.common.data.constant.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 省调度中心枚举
- *
- * @author zzy
- * @version 1.0
- * @since 2019/8/5 9:02
- */
-@Getter
-@AllArgsConstructor
-public enum ProvinceEnum {
-	E11(11, "北京市"),
-	E12(12, "天津市"),
-	E13(13, "河北省-冀北"),
-	E17(17, "河北省-南网"),
-	E14(14, "山西省"),
-	E15(15, "内蒙古自治区-蒙东"),
-	E16(16, "内蒙古自治区-蒙西"),
-	E21(21, "辽宁省"),
-	E22(22, "吉林省"),
-	E23(23, "黑龙江省"),
-	E31(31, "上海市"),
-	E32(32, "江苏省"),
-	E33(33, "浙江省"),
-	E34(34, "安徽省"),
-	E35(35, "福建省"),
-	E36(36, "江西省"),
-	E37(37, "山东省"),
-	E41(41, "河南省"),
-	E42(42, "湖北省"),
-	E43(43, "湖南省"),
-	E44(44, "广东省"),
-	E45(45, "广西壮族自治区"),
-	E46(46, "海南省"),
-	E50(50, "重庆市"),
-	E51(51, "四川省"),
-	E52(52, "贵州省"),
-	E53(53, "云南省"),
-	E54(54, "西藏自治区"),
-	E61(61, "陕西省"),
-	E62(62, "甘肃省"),
-	E63(63, "青海省"),
-	E64(64, "宁夏回族自治区"),
-	E65(65, "新疆维吾尔自治区"),
-	E99(99, "华北直调");
-	private Integer code;
-	private String message;
-}

+ 0 - 16
ipfcst-common/ipfcst-common-data/src/main/java/com/jiayue/ipfcst/common/data/entity/ElectricField.java

@@ -1,9 +1,7 @@
 package com.jiayue.ipfcst.common.data.entity;
 
 import com.jiayue.ipfcst.common.data.abst.AbstractBaseEntity;
-import com.jiayue.ipfcst.common.data.constant.enums.ElectricFieldStatrsEnum;
 import com.jiayue.ipfcst.common.data.constant.enums.ElectricFieldTypeEnum;
-import com.jiayue.ipfcst.common.data.constant.enums.ProvinceEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -36,13 +34,6 @@ public class ElectricField extends AbstractBaseEntity {
     private String stationCode;
 
     /**
-     * 场站状态
-     */
-    @Column
-    @Enumerated(EnumType.STRING)
-    private ElectricFieldStatrsEnum stationStatusEnum;
-
-    /**
      * 电站名称
      */
     @Column
@@ -103,13 +94,6 @@ public class ElectricField extends AbstractBaseEntity {
     private ElectricFieldTypeEnum electricFieldTypeEnum;
 
     /**
-     * 上报省调
-     */
-    @Column
-    @Enumerated(EnumType.STRING)
-    private ProvinceEnum provinceEnum;
-
-    /**
      * 入库时间间隔  单位 s
      */
     private Integer interval;

+ 258 - 309
ipfcst-console/src/main/frontend/views/console/electricField/index.vue

@@ -1,216 +1,183 @@
 <template>
   <div class="app-container">
+    <div>
+      <el-card>
+        <div slot="header" class="clearfix">
+          <b><span>场站信息</span></b>
+          <el-button
+            v-loading="tableLoading"
+            style="float: right;padding:3px 10px 3px 3px;"
+            type="text"
+            @click="exportDataEvent"
+          >导出数据
+          </el-button>
+        </div>
+        <el-button type="primary" size="small" style="round-clip: 10px" :loading="loadButton" @click="insertEvent">添加</el-button>
+        <div style="padding-top: 10px">
+          <vxe-table
+            v-show="showTable"
+            ref="xTable"
+            export-config
+            :keep-source="true"
+            align="center"
+            :loading="loading"
+            highlight-current-row
+            auto-resize
+            border
+            resizable
+            max-height="600px"
+            :edit-rules="rules"
+            :data="form"
+            :edit-config="{trigger: 'manual', mode: 'row',autoClear: false,icon:'none'}"
+          >
+            <vxe-table-column title="场站信息" align="center">
+              <vxe-table-column
+                field="stationCode"
+                title="场站编号"
+                width="8%"
+                align="center"
+                :edit-render="{name: '$input', attrs: {type: 'text'}}"
+              />
+              <vxe-table-column
+                field="sign"
+                title="场站标识"
+                width="8%"
+                align="center"
+                :edit-render="{name: '$input', attrs: {type: 'text'}}"
+              />
+              <vxe-table-column
+                field="name"
+                title="场站名称"
+                width="8%"
+                align="center"
+                :edit-render="{name: '$input', attrs: {type: 'text'}}"
+              />
+              <vxe-table-column
+                field="netSubstationName"
+                title="别名(上网变电站名称)"
+                width="8%"
+                align="center"
+                :edit-render="{name: '$input', attrs: {type: 'text'}}"
+              />
+              <vxe-table-column
+                field="electricFieldTypeEnum"
+                title="场站类型"
+                width="8%"
+                align="center"
+                :edit-render="{name: '$select', options: electricTypeList}"
+              />
+              <vxe-table-column
+                field="capacity"
+                title="装机容量"
+                width="8%"
+                align="center"
+                :edit-render="{name: '$input', attrs: {type: 'text'}}"
+              />
+              <vxe-table-column
+                field="interval"
+                title="入库间隔(单位s)"
+                width="8%"
+                align="center"
+                :edit-render="{name: '$select', options: intervals}"
+              />
+              <vxe-table-column
+                field="gridCE"
+                title="并网设备数"
+                width="8%"
+                align="center"
+                :edit-render="{name: '$input', attrs: {type: 'text'}}"
+              />
+              <vxe-table-column
+                field="longitude"
+                title="场站经度"
+                width="8%"
+                align="center"
+                :edit-render="{name: '$input', attrs: {type: 'text'}}"
+              />
+              <vxe-table-column
+                field="latitude"
+                title="场站纬度"
+                width="8%"
+                align="center"
+                :edit-render="{name: '$input', attrs: {type: 'text'}}"
+              />
+              <vxe-table-column
+                field="altitude"
+                title="场站海拔"
+                width="8%"
+                align="center"
+                :edit-render="{name: '$input', attrs: {type: 'text'}}"
+              />
+              <vxe-table-column
+              field="company"
+              title="场站所属公司"
+              width="8%"
+              align="center"
+              :edit-render="{name: '$input', attrs: {type: 'text'}}"
+              />
+              <vxe-table-column
+                field="location"
+                title="场站位置"
+                width="8%"
+                align="center"
+                :edit-render="{name: '$input', attrs: {type: 'text'}}"
+              />
+              <vxe-table-column
+                field="area"
+                title="场站面积"
+                width="8%"
+                align="center"
+                :edit-render="{name: '$input', attrs: {type: 'text'}}"
+              />
+              <vxe-table-column title="操作" fixed="right" width="10%" align="center">
+                <template v-slot="{ row }">
+                  <template v-if="$refs.xTable.isActiveByRow(row)">
+                    <el-button
+                      type="success"
+                      style="padding: 3px 4px 3px 4px;margin: 2px;"
+                      size="medium"
+                      icon="el-icon-edit"
+                      @click="editSave(row)"
+                    >保存
+                    </el-button>
+                    <el-button
+                      class="cancel-btn"
+                      icon="el-icon-refresh"
+                      type="warning"
+                      style="padding: 3px 4px 3px 4px;margin: 2px;"
+                      size="medium"
+                      @click="cancelRowEvent(row)"
+                    >取消
+                    </el-button>
+                  </template>
+                  <template v-else>
+                    <el-button
+                      :loading="loadButton"
+                      type="primary"
+                      style="padding: 3px 4px 3px 4px;margin: 2px;"
+                      size="medium "
+                      icon="el-icon-edit"
+                      @click="editRowEvent(row)"
+                    >编辑
+                    </el-button>
+                    <el-button
+                      :loading="loadButton"
+                      type="danger"
+                      style="padding: 3px 4px 3px 4px;margin: 2px;"
+                      size="medium "
+                      icon="el-icon-delete"
+                      @click="deleteRowEvent(row)"
+                    >删除
+                    </el-button>
+                  </template>
+                </template>
+              </vxe-table-column>
 
-    <el-card>
-      <div slot="header" class="clearfix">
-        <b><span>场站信息</span></b>
-        <el-button
-          v-loading="tableLoading"
-          style="float: right;padding:3px 10px 3px 3px;"
-          type="text"
-          @click="exportDataEvent"
-        >导出数据
-        </el-button>
-      </div>
-
-      <div class="filter-container">
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-edit"
-          style="margin-bottom: 10px;"
-          @click="downloadFile"
-        >
-          导出配置文件
-        </el-button>
-      </div>
-      <div>
-        <el-card style="width: 80%;margin-left: 10%">
-          <div style="height: 30px" />
-          <el-form ref="form" v-loading="tableLoading" :model="form" :rules="rules">
-
-            <el-row style="gutter:30;text-align: left" class="row-bg el-row-two" justify="space-between">
-              <el-col :span="12">
-                <el-form-item label="场站编号:" prop="stationCode" label-width="180px">
-                  <el-input v-model="form.stationCode" placeholder="必填项" maxlength="32" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="场站状态:" prop="stationStatusEnum" label-width="180px">
-                  <el-input v-model="form.stationStatusEnum.message" placeholder="运维中" maxlength="32" readonly />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row style="gutter:30" class="row-bg el-row-two" justify="space-between">
-
-              <el-col :span="12">
-                <el-form-item label="场站标识:" prop="sign" label-width="180px">
-                  <el-input v-model="form.sign" placeholder="必填项" maxlength="32" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="场站名称:" prop="name" label-width="180px">
-                  <el-input v-model="form.name" placeholder="必填项" maxlength="85" />
-                </el-form-item>
-              </el-col>
-
-            </el-row>
-
-            <el-row style="gutter:30" class="row-bg el-row-two" justify="space-between">
-              <el-col :span="12">
-                <el-form-item
-                  label="别名(上网变电站名称):"
-                  prop="netSubstationName"
-                  label-width="180px"
-                  style="min-width: 110px"
-                >
-                  <el-input v-model="form.netSubstationName" placeholder="必填项" maxlength="32" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item
-                  label="装机容量(MW):"
-                  prop="capacity"
-                  label-width="180px"
-                  style="min-width: 110px"
-                >
-                  <el-input v-model="form.capacity" placeholder="必填项" maxlength="85" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row style="gutter:30" class="row-bg el-row-two" justify="space-between">
-              <el-col :span="12">
-                <el-form-item label="场站类型:" label-width="180px" prop="electricFieldTypeEnum">
-                  <el-select
-                    v-model="form.electricFieldTypeEnum"
-                    placeholder="请选择"
-                    filterable
-                    style="width: 100%"
-                  >
-                    <el-option
-                      v-for="item in this.electricTypeList"
-                      :key="item.key"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="上报省调:" label-width="180px" prop="provinceEnum">
-                  <el-select
-                    v-model="form.provinceEnum"
-                    placeholder="请选择"
-                    filterable
-                    style="width: 100%"
-                  >
-                    <el-option
-                      v-for="item in this.provinceTypeList"
-                      :key="item.key"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-
-            </el-row>
-
-            <el-row style="gutter:30" class="row-bg" justify="space-between">
-              <el-col :span="12">
-                <el-form-item label="入库间隔(单位s):" prop="interval" label-width="180px">
-                  <el-select
-                    v-model="form.interval"
-                    placeholder="请选择"
-                    filterable
-                    style="width: 100%"
-                  >
-                    <el-option
-                      v-for="item in this.intervals"
-                      :key="item.key"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="并网设备数:" prop="gridCE" label-width="180px">
-                  <el-input v-model="form.gridCE" placeholder="必填项" maxlength="10" />
-                </el-form-item>
-              </el-col>
-
-            </el-row>
-            <el-row style="gutter:30" class="row-bg" justify="space-between">
-
-              <el-col :span="12">
-                <el-form-item label="场站经度:" prop="longitude" label-width="180px">
-                  <el-input v-model="form.longitude" placeholder="必填项" maxlength="10" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="场站纬度:" prop="latitude" label-width="180px">
-                  <el-input v-model="form.latitude" placeholder="必填项" maxlength="10" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row style="gutter:30" class="row-bg" justify="space-between">
-
-              <el-col :span="12">
-                <el-form-item label="场站海拔:" prop="altitude" label-width="180px">
-                  <el-input v-model="form.altitude" placeholder="必填项" maxlength="10" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="场站所属公司:" prop="company" label-width="180px">
-                  <el-input v-model="form.company" placeholder="必填项" maxlength="100" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row style="gutter:30" class="row-bg" justify="space-between">
-
-              <el-col :span="12">
-                <el-form-item label="场站位置:" prop="location" label-width="180px">
-                  <el-input v-model="form.location" placeholder="必填项" maxlength="100" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="场站面积:" prop="area" label-width="180px">
-                  <el-input v-model="form.area" placeholder="必填项" maxlength="10" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row style="gutter:30" class="row-bg" justify="space-between">
-
-              <el-col :span="12">
-                <el-form-item label="所属地调(文本):" prop="backupA" label-width="180px">
-                  <el-input v-model="form.backupA" placeholder="选填项" maxlength="20" />
-                </el-form-item>
-              </el-col>
-
-            </el-row>
-          </el-form>
-          <div style="text-align: center">
-            <span slot="footer" class="dialog-footer">
-              <el-button
-                v-loading="tableLoading"
-                type="primary"
-                style="width: 15%"
-                @click="saveElectricField('form')"
-              >保 存</el-button>
-              <!--                    <span style="width: 200px"></span>-->
-              <!--                  <el-button v-loading="tableLoading" @click="deleteRowEvent(form)">删 除</el-button>-->
-              <!--                    <el-button v-loading="tableLoading" @click="resetForm('form')">重 置</el-button>-->
-            </span>
-          </div>
-          <div style="height: 30px" />
-        </el-card>
-        <div style="height: 20px" />
-      </div>
-    </el-card>
+            </vxe-table-column>
+          </vxe-table>
+        </div>
+      </el-card>
+    </div>
 
   </div>
 
@@ -223,18 +190,10 @@ export default {
   data() {
     return {
       addVisible: false,
-      loading: true,
       tableLoading: false,
-      tableData: {},
-      datas: {},
       showCreateButton: false,
-      provinceTypeList: [],
       electricTypeList: [],
-      form: { stationStatusEnum: {
-        code: 'E1',
-        message: '未运维'
-      }},
-      electricFieldStatrsEnumList: [],
+      form: {},
       intervals: [{ key: 0, value: 0, label: '不入库' },{ key: 60, value: 60, label: '一分钟' }, { key: 900, value: 900, label: '十五分钟' }],
       // 表单验证规则
       rules: {
@@ -299,8 +258,14 @@ export default {
           { required: true, message: '请填写场站面积' },
           { pattern: /^\d+(\.\d{2})?$/, message: '只能输入正数数字或带两位小数的数字' }
           // {message: '输入过长', max: 50}
-        ]
-      }
+        ],
+
+      },
+      isEdit:false,
+      loadButton: false,
+      loading: false,
+      showTable: true,
+      delVisible: false,
     }
   },
   created() {
@@ -309,32 +274,79 @@ export default {
   mounted() {
   },
   methods: {
-    getData() {
-      Promise.all([this.getEl(), this.getProvince(), this.getElType(), this.getElectricFieldStatrsEnum()]).then((results) => {
-        this.provinceTypeList = results[1]
-        this.electricTypeList = results[2]
-        // window.console.log(this.provinceTypeList)
-        this.electricFieldStatrsEnumList = results[3]
-        if (results[0] == null) {
-          this.showCreateButton = true
-          this.form = {
-            stationStatusEnum: {
-              code: 'E1',
-              message: '未运维'
-            }
-          }
-          this.tableData = {
-            stationStatusEnum: {
-              code: 'E1',
-              message: '未运维'
+    //添加按钮
+    insertEvent(row) {
+      this.showTable = true
+      this.piadd = false
+      this.isEdit = false
+      this.loadButton = true
+      this.$refs.xTable.insert({ interval: 60 }).then(({ row }) => this.$refs.xTable.setActiveRow(row))
+    },
+    //保存按钮
+    editSave(row) {
+      this.$refs.xTable.validate(this.$refs.xTable.getCurrentRecord(),valid => {
+        console.log(row)
+        if (valid) {
+          this.$refs.xTable.clearActived().then(() => {
+            if (this.isEdit) {
+              console.log(1)
+              // 编辑保存
+              this.$axios.post('/electricField/updateElectricField', row).then(res => {
+                this.$message({
+                  message: '修改成功',
+                  type: 'success'
+                })
+                this.loadButton = false
+                this.getData()
+              }).catch((error) => {
+                this.$refs.xTable.setActiveRow(row)
+                this.$message.error('修改场站信息' + error)
+              })
+            } else {
+              // 新增保存
+              this.$axios.post('/electricField/', row).then(res => {
+                this.$message({
+                  message: '保存成功',
+                  type: 'success'
+                })
+                this.loadButton = false
+                this.getData()
+              }).catch((error) => {
+                this.$refs.xTable.setActiveRow(row)
+                this.$message.error('保存场站信息出错' + error)
+              })
             }
-          }
+          })
         } else {
-          this.form = results[0]
-          this.tableData = results[0]
-          // window.console.log(this.tableData)
+          this.$XModal.message({status: 'error', message: '校验不通过!'})
         }
-
+      })
+    },
+    //编辑 取消按钮
+    cancelRowEvent(row) {
+      const xTable = this.$refs.xTable
+      xTable.clearActived().then(() => {
+        // 还原行数据
+        if (this.isEdit) {
+          //编辑
+          xTable.revertData(row)
+        } else {
+          //新增
+          xTable.remove(row)
+        }
+        this.loadButton = false;
+      })
+    },
+    //编辑按钮
+    editRowEvent(row) {
+      this.isEdit = true
+      this.loadButton = true
+      this.$refs.xTable.setActiveRow(row)
+    },
+    getData() {
+      Promise.all([this.getEl(), this.getElType()]).then((results) => {
+        this.electricTypeList = results[1]
+        this.form = results[0]
         this.loading = false
       })
     },
@@ -349,21 +361,10 @@ export default {
         })
       })
     },
-    getProvince() {
-      const a = this.$axios
-      return new Promise(function(resolve, reject) {
-        a.get('/electricField/getProvince').then(res => {
-          resolve(res.data)
-          // console.log("获取上报类型枚举信息成功")
-        }).catch((error) => {
-          this.$message.error('获取上报类型枚举信息出错' + error)
-        })
-      })
-    },
     getEl() {
       const a = this.$axios
       return new Promise(function(resolve, reject) {
-        a.get('/electricField/').then(res => {
+        a.get('/electricField/getElectricField').then(res => {
           resolve(res.data)
           // console.log("获取场站信息成功")
         }).catch((error) => {
@@ -371,54 +372,7 @@ export default {
         })
       })
     },
-    getElectricFieldStatrsEnum() {
-      const a = this.$axios
-      return new Promise(function(resolve, reject) {
-        a.get('/electricField/getElectricFieldStatrsEnum').then(res => {
-          resolve(res.data)
-          // console.log("获取场站状态信息成功")
-        }).catch((error) => {
-          this.$message.error('获取场站状态信息出错' + error)
-        })
-      })
-    },
-    downloadFile() {
-      this.loading = true
-      this.$axios.post('/electricField/dataDownload', {
-        responseType: 'blob'// 用于解决中文乱码
-      }).then((response) => {
-        this.loading = false
-      }).catch((error) => {
-        console.log(error)
-        this.loading = false
-      })
-    },
-    saveElectricField(formName) {
-      // window.console.log(this.form)
-      this.form.stationStatusEnum = 'E1'
-      const a = this.$axios
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          this.tableLoading = true
-          a.post('/electricField/', this.form).then(res => {
-            this.$message({
-              message: '保存成功',
-              type: 'success'
-            })
-            this.addVisible = false
-            this.tableLoading = false
-            this.getData()
-            this.showCreateButton = false
-          }).catch((error) => {
-            this.$message.error('添加场站信息出错' + error)
-            this.tableLoading = false
-          })
-        } else {
-          this.$message.error('添加信息未通过验证,请查看提示')
-          return false
-        }
-      })
-    },
+
     // 删除场站信息
     deleteRowEvent(row) {
       this.$XModal.confirm('删除不可恢复!!!确认删除?').then(type => {
@@ -435,11 +389,6 @@ export default {
         }
       })
     },
-    // 重置表单
-    resetForm(formName) {
-      this.$refs[formName].resetFields()
-      this.form = this.tableData
-    },
     exportDataEvent() {
       this.loading = true
       this.$axios.post('/electricField/export', {}, {

+ 0 - 1
ipfcst-console/src/main/frontend/views/console/sysParameter/index.vue

@@ -197,7 +197,6 @@ export default {
       this.saveLoding = false
       this.$axios.get('/electricField/getElectricField').then((res) => {
       for(let i = 0 ; i < res.data.length ; i ++){
-        console.log(res.data[i].name)
         this.eCode.push({label:res.data[i].stationCode.toString()+res.data[i].name,value:res.data[i].stationCode})
       }
       }).catch((error) => {

+ 3 - 64
ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/ElectricFieldController.java

@@ -1,16 +1,9 @@
 package com.jiayue.ipfcst.console.controller;
 
-import cn.hutool.core.date.DateUtil;
 import com.jiayue.ipfcst.aop.SaveValidate;
-import com.jiayue.ipfcst.common.core.util.JsonBeanUtil;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
-import com.jiayue.ipfcst.common.data.constant.enums.ElectricFieldStatrsEnum;
 import com.jiayue.ipfcst.common.data.constant.enums.ElectricFieldTypeEnum;
-import com.jiayue.ipfcst.common.data.constant.enums.ProvinceEnum;
 import com.jiayue.ipfcst.common.data.entity.ElectricField;
-import com.jiayue.ipfcst.common.data.entity.OverhaulPlan;
-import com.jiayue.ipfcst.common.data.entity.Quartz;
-import com.jiayue.ipfcst.common.data.entity.SysParameter;
 
 import com.jiayue.ipfcst.console.service.*;
 
@@ -18,7 +11,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
@@ -98,7 +90,7 @@ public class ElectricFieldController {
     @SaveValidate
     public ResponseVO saveElectricField(@RequestBody ElectricField electricField) {
         try {
-            electricFieldService.update(electricField);
+            electricFieldService.add(electricField);
             return ResponseVO.success();
         } catch (Exception e) {
             e.printStackTrace();
@@ -115,7 +107,7 @@ public class ElectricFieldController {
      * @param electricField 场站实体参数
      * @return 执行结果
      */
-    @PutMapping(value = "/")
+    @PostMapping(value = "/updateElectricField")
     @SaveValidate
     public ResponseVO updateElectricField(@RequestBody ElectricField electricField) {
         try {
@@ -165,37 +157,6 @@ public class ElectricFieldController {
 
     /**
      * 功能描述: <br>
-     * 〈返回上报类型〉
-     *
-     * @param: []
-     * @Return: com.jiayue.ipfcst.console.dto.ResponseBean
-     * @Author: YH
-     * @Date: 2020/3/3 14:08
-     */
-    @GetMapping(value = "/getProvince")
-    public ResponseVO getProvince() {
-        List<Map<String, Object>> provinceType = new ArrayList<>();
-        Map<String, Object> map;
-        try {
-            for (ProvinceEnum e : ProvinceEnum.values()) {
-                map = new HashMap<>();
-                map.put("label", e.getMessage());
-                map.put("key", e.name());
-                map.put("value", e.name());
-                provinceType.add(map);
-            }
-            return ResponseVO.success(provinceType);
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error(" 获取场站上报类型异常");
-            return ResponseVO.fail(provinceType);
-        }
-
-    }
-
-
-    /**
-     * 功能描述: <br>
      * 〈返回场站类型〉
      *
      * @param: []
@@ -226,26 +187,6 @@ public class ElectricFieldController {
 
 
 
-    @GetMapping(value = "/getElectricFieldStatrsEnum")
-    public ResponseVO getElectricFieldStatrsEnum() {
-        List<Map<String, Object>> list = new ArrayList<>();
-        Map<String, Object> map;
-        try {
-            for (ElectricFieldStatrsEnum e : ElectricFieldStatrsEnum.values()) {
-                map = new HashMap<>();
-                map.put("label", e.getMessage());
-                map.put("key", e.name());
-                map.put("value", e.name());
-                list.add(map);
-            }
-            return ResponseVO.success(list);
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error(" 获取场站状态类型异常");
-            return ResponseVO.fail(list);
-        }
-
-    }
 
     /*@PostMapping(value = "/dataDownload")
     public void dataDownload(HttpServletRequest request,
@@ -531,12 +472,11 @@ public class ElectricFieldController {
             StringBuilder templateContent = new StringBuilder();
             response.setCharacterEncoding("UTF-8");
             List<ElectricField> electricFieldList = electricFieldService.getAll();
-            String header = "\"场站编号\"" + "," + "\"场站状态\"" + "," + "\"场站名称\"" + "," + "\"场站标识\"" + "," + "\"别名\"" + "," + "\"装机容量\"" + "," + "\"并网设备数\"" + "," + "\"场站经度\"" + "," + "\"场站纬度\"" + "," + "\"场站类型\"" + "," + "\"上报省调\"" + "," + "\"入库时间\"" + "," + "\"场站海拔\"" + "," + "\"场站所属公司\"" + "," + "\"场站位置\"" + "," + "\"场站面积\"" + "\r\n";
+            String header = "\"场站编号\"" + "," + "\"场站名称\"" + "," + "\"场站标识\"" + "," + "\"别名\"" + "," + "\"装机容量\"" + "," + "\"并网设备数\"" + "," + "\"场站经度\"" + "," + "\"场站纬度\"" + "," + "\"场站类型\"" + "," + "\"入库时间\"" + "," + "\"场站海拔\"" + "," + "\"场站所属公司\"" + "," + "\"场站位置\"" + "," + "\"场站面积\"" + "\r\n";
 
             StringBuilder content = new StringBuilder();
             for(ElectricField electricField:electricFieldList){
               content.append(electricField.getStationCode() + ",");
-              content.append(electricField.getStationStatusEnum().getMessage() + ",");
               content.append(electricField.getName() + ",");
               content.append(electricField.getSign() + ",");
               content.append(electricField.getNetSubstationName() + ",");
@@ -545,7 +485,6 @@ public class ElectricFieldController {
               content.append(electricField.getLongitude() + ",");
               content.append(electricField.getLatitude() + ",");
               content.append(electricField.getElectricFieldTypeEnum().getMessage() + ",");
-              content.append(electricField.getProvinceEnum().getMessage() + ",");
               content.append(electricField.getInterval() + ",");
               content.append(electricField.getAltitude() + ",");
               content.append(electricField.getCompany() + ",");

+ 0 - 2
ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/ElectricFieldService.java

@@ -1,7 +1,6 @@
 package com.jiayue.ipfcst.console.service;
 
 import com.jiayue.ipfcst.common.core.exception.BusinessException;
-import com.jiayue.ipfcst.common.data.constant.enums.ElectricFieldStatrsEnum;
 import com.jiayue.ipfcst.common.data.entity.ElectricField;
 import com.jiayue.ipfcst.common.data.repository.ElectricFieldRepository;
 import com.jiayue.ipfcst.common.data.service.BaseService;
@@ -52,7 +51,6 @@ public class ElectricFieldService extends BaseService {
    */
   @Transactional(propagation = Propagation.SUPPORTS)
   public void add(ElectricField electricField) {
-    electricField.setStationStatusEnum(ElectricFieldStatrsEnum.E1);
     this.electricFieldRepository.save(electricField);
   }