pms pq修改

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/FpyReportDTO.java

@@ -0,0 +1,78 @@
+package com.njcn.harmonic.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2023/5/31
+ */
+@Data
+public class FpyReportDTO {
+
+    @ApiModelProperty(name = "lineId",value = "监测点id")
+    private String lineId;
+
+    @ApiModelProperty(name = "lineName",value = "监测点名称")
+    private String lineName;
+
+    @ApiModelProperty(name = "subId",value = "变电站id")
+    private String subId;
+
+    @ApiModelProperty(name = "subName",value = "变电站名称")
+    private String subName;
+
+    @ApiModelProperty(name = "voltageScale",value = "监测点电压等级")
+    private String voltageScale;
+
+
+    @ApiModelProperty(name = "ct1",value = "ct1")
+    private Integer ct1;
+
+    @ApiModelProperty(name = "ct2",value = "ct2")
+    private Integer ct2;
+
+    @ApiModelProperty(name = "pt1",value = "pt1")
+    private Integer pt1;
+
+    @ApiModelProperty(name = "pt2",value = "pt2")
+    private Integer pt2;
+
+    @ApiModelProperty(name = "loadType",value = "干扰源类型")
+    private String loadType;
+
+    @ApiModelProperty(name = "businessType",value = "行业类型")
+    private String businessType;
+
+    @ApiModelProperty(name = "dealCapacity",value = "协议容量")
+    private Float dealCapacity;
+
+    @ApiModelProperty(name = "shortCapacity",value = "短路容量")
+    private Float shortCapacity;
+
+    @ApiModelProperty(name = "deviceCapacity",value = "设备容量")
+    private Float deviceCapacity;
+
+    @ApiModelProperty(name = "standardCapacity",value = "基准容量")
+    private Float standardCapacity;
+
+    @ApiModelProperty(name = "calssificationGrade",value = "分类等级")
+    private String calssificationGrade;
+
+    @ApiModelProperty(name = "superiorsSubstation",value = "上级电站")
+    private String superiorsSubstation;
+
+    @ApiModelProperty(name = "hangLine",value = "挂接线路")
+    private String hangLine;
+
+    private Float integrityValue;
+
+    private String harmDes;
+
+    private String powerDes;
+
+}

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/QualifiedReportParam.java

@@ -0,0 +1,32 @@
+package com.njcn.harmonic.pojo.param;
+
+import com.njcn.web.pojo.annotation.DateTimeStrValid;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2023/5/31
+ */
+@Data
+public class QualifiedReportParam extends BaseParam {
+
+    @ApiModelProperty(name = "deptId",value = "部门id")
+    @NotBlank(message = "部门索引不可为空")
+    private String deptId;
+
+    @ApiModelProperty(name = "beginTime",value = "开始时间")
+    @DateTimeStrValid(message = "开始时间格式有误")
+    @NotBlank(message = "开始时间不可为空")
+    private String beginTime;
+
+    @ApiModelProperty(name = "endTime",value = "结束时间")
+    @DateTimeStrValid(message = "结束时间格式有误")
+    @NotBlank(message = "结束时间不可为空")
+    private String endTime;
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/report/QualifiedReport.java

@@ -0,0 +1,56 @@
+package com.njcn.harmonic.controller.report;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pq.pojo.param.PulicTimeStatisParam;
+import com.njcn.harmonic.pojo.dto.FpyReportDTO;
+import com.njcn.harmonic.pojo.param.QualifiedReportParam;
+import com.njcn.harmonic.pojo.vo.AssesVO;
+import com.njcn.harmonic.service.majornetwork.QualifiedReportService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * pqs
+ * 合格率报告
+ * @author cdf
+ * @date 2023/5/31
+ */
+@Slf4j
+@RestController
+@RequestMapping("/qualifiedReport")
+@Api(tags = "报告-合格率报告")
+@RequiredArgsConstructor
+public class QualifiedReport extends BaseController {
+
+    private final QualifiedReportService qualifiedReportService;
+
+    /**
+     * 合格率报告
+     * @author cdf
+     * @date \
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/page")
+    @ApiOperation("合格率报告")
+    @ApiImplicitParam(name = "qualifiedReportParam", value = "合格率报告参数", required = true)
+    public HttpResult<FpyReportDTO> page(@RequestBody @Validated QualifiedReportParam qualifiedReportParam) {
+        String methodDescribe = getMethodDescribe("page");
+        AssesVO list = assesService.getQualityAssessData(pulicTimeStatisParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/QualifiedReportService.java

@@ -0,0 +1,23 @@
+package com.njcn.harmonic.service.majornetwork;
+
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.harmonic.pojo.dto.FpyReportDTO;
+import com.njcn.harmonic.pojo.param.QualifiedReportParam;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2023/5/31
+ */
+public interface QualifiedReportService {
+
+    /**
+     * 合格率报告
+     * @author cdf
+     * @date \
+     */
+    HttpResult<FpyReportDTO> page(@RequestBody @Validated QualifiedReportParam qualifiedReportParam);
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/QualifiedReportServiceImpl.java

@@ -0,0 +1,28 @@
+package com.njcn.harmonic.service.majornetwork.impl;
+
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.harmonic.pojo.dto.FpyReportDTO;
+import com.njcn.harmonic.pojo.param.QualifiedReportParam;
+import com.njcn.harmonic.service.majornetwork.QualifiedReportService;
+import org.springframework.stereotype.Service;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2023/5/31
+ */
+@Service
+public class QualifiedReportServiceImpl implements QualifiedReportService {
+
+
+    /**
+     * 合格率报告
+     * @author cdf
+     * @date
+     */
+    @Override
+    public HttpResult<FpyReportDTO> page(QualifiedReportParam qualifiedReportParam) {
+        return null;
+    }
+}