tl 10 mesiacov pred
rodič
commit
24208d9de8

+ 12 - 12
ipp-ap/src/views/an/PFParsing/index.vue

@@ -5,27 +5,27 @@
         <el-tab-pane label="短期" name="dq">
           <dqparsing v-if="isDq"/>
         </el-tab-pane>
-<!--        <el-tab-pane label="超短期" name="cdq">-->
-<!--          <cdqparsing v-if="isCdq"/>-->
-<!--        </el-tab-pane>-->
+        <el-tab-pane label="超短期" name="cdq">
+          <cdqparsing v-if="isCdq"/>
+        </el-tab-pane>
 <!--        <el-tab-pane label="nwp" name="nwp">-->
 <!--          <nwpparsing v-if="isNwp"/>-->
 <!--        </el-tab-pane>-->
-<!--        <el-tab-pane label="气象站" name="qxz">-->
-<!--          <qxzparsing v-if="isQxz"/>-->
-<!--        </el-tab-pane>-->
-<!--        <el-tab-pane label="测风塔" name="cft">-->
-<!--          <cftparsing v-if="isCft"/>-->
-<!--        </el-tab-pane>-->
+        <el-tab-pane label="气象站" name="qxz">
+          <qxzparsing v-if="isQxz"/>
+        </el-tab-pane>
+        <el-tab-pane label="测风塔" name="cft">
+          <cftparsing v-if="isCft"/>
+        </el-tab-pane>
 <!--        <el-tab-pane label="逆变器" name="nbq">-->
 <!--          <nbqparsing v-if="isNbq"/>-->
 <!--        </el-tab-pane>-->
 <!--        <el-tab-pane label="风机" name="fj">-->
 <!--          <fjparsing v-if="isFj"/>-->
 <!--        </el-tab-pane>-->
-<!--        <el-tab-pane label="实际功率" name="rp">-->
-<!--          <rpparsing v-if="isRp"/>-->
-<!--        </el-tab-pane>-->
+        <el-tab-pane label="实际功率" name="rp">
+          <rpparsing v-if="isRp"/>
+        </el-tab-pane>
       </el-tabs>
       <!--通道配置的编辑框-->
       <!--文件类型配置的编辑框-->

+ 133 - 0
ipp-common/ipp-common-data/src/main/java/com/jiayue/ipp/common/data/entity/an/ParsingFjInfo.java

@@ -0,0 +1,133 @@
+package com.jiayue.ipp.common.data.entity.an;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * cdq解析配置
+ * Parse file
+ * @author tl
+ * @version 1.0
+ */
+@Data
+@TableName("pf_parsing_fj_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "pf_parsing_fj_info")
+public class ParsingFjInfo extends ParsingInfo<ParsingFjInfo> implements Serializable {
+
+    /**
+     * 设备名称(该项对应本地设备中的设备名称)
+     */
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+
+    /**
+     * 状态值为1代表运行,2代表待机,3代表停用,4代表故障
+     */
+    @ApiModelProperty(value = "状态值为1代表运行,2代表待机,3代表停用,4代表故障")
+    private String status;
+
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty(value = "时间")
+    private String time;
+
+
+    /**
+     * 有功(KW)
+     */
+    @ApiModelProperty(value = "有功(KW)")
+    private String activePower;
+
+
+    /**
+     * 无功(KVar)
+     */
+    @ApiModelProperty(value = "无功(KVar)")
+    private String reactivePower;
+
+
+    /**
+     * 功率因数
+     */
+    @ApiModelProperty(value = "功率因数")
+    private String powerFactor;
+
+
+    /**
+     * 电压(V)
+     */
+    @ApiModelProperty(value = "电压(V)")
+    private String voltage;
+
+
+    /**
+     * 电流(A)
+     */
+    @ApiModelProperty(value = "电流(A)")
+    private String electricalCurrent;
+
+
+    /**
+     * 当日发电量(kW·h)
+     */
+    @ApiModelProperty(value = "当日发电量(kW·h)")
+    private String dayElectricQuantity;
+
+
+    /**
+     * 当日并网小时
+     */
+    @ApiModelProperty(value = "当日并网小时")
+    private String dayGridConnectedHours;
+
+
+    /**
+     * 转速(rpm)
+     */
+    @ApiModelProperty(value = "转速(rpm)")
+    private String windWheelRatedSpeed;
+
+
+    /**
+     * 风速(m/s)
+     */
+    @ApiModelProperty(value = "风速(m/s)")
+    private String ws;
+
+
+    /**
+     * 风向(°)
+     */
+    @ApiModelProperty(value = "风向(°)")
+    private String wd;
+
+
+    /**
+     * 温度(℃)
+     */
+    @ApiModelProperty(value = "温度(℃)")
+    private String t;
+
+
+    /**
+     * 桨距角(°)
+     */
+    @ApiModelProperty(value = "桨距角(°)")
+    private String pitchAngle;
+
+
+    /**
+     * 累积发电量(MW·h)
+     */
+    @ApiModelProperty(value = "累积发电量(MW·h)")
+    private String cumulativeGeneratedEnergy;
+}

+ 100 - 0
ipp-common/ipp-common-data/src/main/java/com/jiayue/ipp/common/data/entity/an/ParsingNbqInfo.java

@@ -0,0 +1,100 @@
+package com.jiayue.ipp.common.data.entity.an;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * dq解析配置
+ * Parse file
+ * @author tl
+ * @version 1.0
+ */
+@Data
+@TableName("pf_parsing_nbq_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "pf_parsing_nbq_info")
+public class ParsingNbqInfo extends ParsingInfo<ParsingNbqInfo> implements Serializable {
+
+
+    /**
+     * 设备名称(该项对应本地设备中的设备名称)
+     */
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentName;
+
+
+    /**
+     * 状态值为1代表运行,2代表待机,3代表停用,4代表故障
+     */
+    @ApiModelProperty(value = "状态值为1代表运行,2代表待机,3代表停用,4代表故障")
+    private String status;
+
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty(value = "时间")
+    private String time;
+
+
+    /**
+     * 有功(KW)
+     */
+    @ApiModelProperty(value = "有功(KW)")
+    private String activePower;
+
+
+    /**
+     * 无功(KVar)
+     */
+    @ApiModelProperty(value = "无功(KVar)")
+    private String reactivePower;
+
+
+    /**
+     * 功率因数
+     */
+    @ApiModelProperty(value = "功率因数")
+    private String powerFactor;
+
+
+    /**
+     * 电压
+     */
+    @ApiModelProperty(value = "电压")
+    private String voltage;
+
+
+    /**
+     * 电流
+     */
+    @ApiModelProperty(value = "电流")
+    private String electricalCurrent;
+
+
+    /**
+     * 当日发电量
+     */
+    @ApiModelProperty(value = "当日发电量")
+    private String dayElectricQuantity;
+
+
+    /**
+     * 累积发电量
+     */
+    @ApiModelProperty(value = "累积发电量")
+    private String cumulativeGeneratedEnergy;
+
+
+    /**
+     * 当日并网小时数
+     */
+    @ApiModelProperty(value = "当日并网小时数")
+    private String dayGridConnectedHours;
+
+}

+ 56 - 0
ipp-idp/src/main/java/com/jiayue/ipp/idp/controller/an/ParsingCftController.java

@@ -0,0 +1,56 @@
+package com.jiayue.ipp.idp.controller.an;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jiayue.ipp.common.data.entity.an.ParsingCftInfo;
+import com.jiayue.ipp.idp.service.an.ParsingCftInfoService;
+import com.jiayue.ipp.idp.util.R;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/parsingCftController")
+public class ParsingCftController {
+    @Autowired
+    ParsingCftInfoService parsingCftInfoService;
+
+    @ApiOperation(value = "添加Cft配置", notes = "添加Cft配置")
+    @PostMapping()
+    public R add(@RequestBody ParsingCftInfo parsingCftInfo) {
+        if (parsingCftInfoService.save(parsingCftInfo)) {
+            return R.ok("添加成功!");
+        } else {
+            return R.failed("添加失败!");
+        }
+    }
+
+    @ApiOperation(value = "修改Cft配置", notes = "修改Cft配置")
+    @PutMapping()
+    public R update(@RequestBody ParsingCftInfo parsingCftInfo) {
+        if (parsingCftInfoService.updateById(parsingCftInfo)) {
+            return R.ok("修改成功!");
+        } else {
+            return R.failed("修改失败!");
+        }
+    }
+
+    @ApiOperation(value = "根据id删除Cft配置", notes = "根据id删除Cft配置")
+    @DeleteMapping("/{id}")
+    public R delete(@PathVariable String id) {
+        if (parsingCftInfoService.removeById(id)) {
+            return R.ok("删除成功!");
+        } else {
+            return R.failed("删除失败!");
+        }
+    }
+
+    @ApiOperation(value = "分页查询Cft配置", notes = "分页查询Cft配置")
+    @GetMapping("/page")
+    public R page(ParsingCftInfo parsingCftInfo, Page page) {
+        return R.ok(parsingCftInfoService.page(page, Wrappers.query(parsingCftInfo)));
+    }
+}

+ 56 - 0
ipp-idp/src/main/java/com/jiayue/ipp/idp/controller/an/ParsingQxzController.java

@@ -0,0 +1,56 @@
+package com.jiayue.ipp.idp.controller.an;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jiayue.ipp.common.data.entity.an.ParsingQxzInfo;
+import com.jiayue.ipp.idp.service.an.ParsingQxzInfoService;
+import com.jiayue.ipp.idp.util.R;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/parsingQxzController")
+public class ParsingQxzController {
+    @Autowired
+    ParsingQxzInfoService parsingQxzInfoService;
+
+    @ApiOperation(value = "添加Qxz配置", notes = "添加Qxz配置")
+    @PostMapping()
+    public R add(@RequestBody ParsingQxzInfo parsingQxzInfo) {
+        if (parsingQxzInfoService.save(parsingQxzInfo)) {
+            return R.ok("添加成功!");
+        } else {
+            return R.failed("添加失败!");
+        }
+    }
+
+    @ApiOperation(value = "修改Qxz配置", notes = "修改Qxz配置")
+    @PutMapping()
+    public R update(@RequestBody ParsingQxzInfo parsingQxzInfo) {
+        if (parsingQxzInfoService.updateById(parsingQxzInfo)) {
+            return R.ok("修改成功!");
+        } else {
+            return R.failed("修改失败!");
+        }
+    }
+
+    @ApiOperation(value = "根据id删除Qxz配置", notes = "根据id删除Qxz配置")
+    @DeleteMapping("/{id}")
+    public R delete(@PathVariable String id) {
+        if (parsingQxzInfoService.removeById(id)) {
+            return R.ok("删除成功!");
+        } else {
+            return R.failed("删除失败!");
+        }
+    }
+
+    @ApiOperation(value = "分页查询Qxz配置", notes = "分页查询Qxz配置")
+    @GetMapping("/page")
+    public R page(ParsingQxzInfo parsingQxzInfo, Page page) {
+        return R.ok(parsingQxzInfoService.page(page, Wrappers.query(parsingQxzInfo)));
+    }
+}

+ 16 - 0
ipp-idp/src/main/java/com/jiayue/ipp/idp/mapper/an/ParsingFjInfoMapper.java

@@ -0,0 +1,16 @@
+package com.jiayue.ipp.idp.mapper.an;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jiayue.ipp.common.data.entity.an.ParsingFjInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 风机解析信息dao层
+ *
+ * @author tl
+ * @date 2022-05-11 09:47:21
+ */
+@Mapper
+public interface ParsingFjInfoMapper extends BaseMapper<ParsingFjInfo> {
+
+}

+ 16 - 0
ipp-idp/src/main/java/com/jiayue/ipp/idp/mapper/an/ParsingNbqInfoMapper.java

@@ -0,0 +1,16 @@
+package com.jiayue.ipp.idp.mapper.an;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jiayue.ipp.common.data.entity.an.ParsingNbqInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 逆变器解析信息dao层
+ *
+ * @author tl
+ * @date 2022-05-11 09:47:21
+ */
+@Mapper
+public interface ParsingNbqInfoMapper extends BaseMapper<ParsingNbqInfo> {
+
+}

+ 15 - 0
ipp-idp/src/main/java/com/jiayue/ipp/idp/service/an/ParsingFjInfoService.java

@@ -0,0 +1,15 @@
+package com.jiayue.ipp.idp.service.an;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jiayue.ipp.common.data.entity.an.ParsingFjInfo;
+
+/**
+ * 风机解析信息业务层接口
+ *
+ * @author tl
+ * @date 2022-05-11 09:51:21
+ */
+public interface ParsingFjInfoService extends IService<ParsingFjInfo> {
+
+
+}

+ 15 - 0
ipp-idp/src/main/java/com/jiayue/ipp/idp/service/an/ParsingNbqInfoService.java

@@ -0,0 +1,15 @@
+package com.jiayue.ipp.idp.service.an;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jiayue.ipp.common.data.entity.an.ParsingNbqInfo;
+
+/**
+ * 逆变器解析信息业务层接口
+ *
+ * @author tl
+ * @date 2022-05-11 09:51:21
+ */
+public interface ParsingNbqInfoService extends IService<ParsingNbqInfo> {
+
+
+}