pms pq修改

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/DeptGetChildrenMoreDTO.java

@@ -16,7 +16,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class DeptGetChildrenMoreDTO extends DeptGetBase {
 
-    @ApiModelProperty(name = "lineBaseList",value = "监测点信息")
+    @ApiModelProperty(name = "lineBaseList",value = "主网监测点信息")
     private List<LineDevGetDTO> lineBaseList;
 
     @ApiModelProperty(name = "pwMonitorIds",value = "配网监测点信息")

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/StatationStatParam.java

@@ -19,7 +19,6 @@ public class StatationStatParam {
      * 电站编号
      */
     @ApiModelProperty(value = "电站编号",required = true)
-    @NotBlank(message = "电站编号不可为空")
     private String powerId;
 
     /**

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml

@@ -14,7 +14,7 @@
         <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
-        AND Is_Up_To_Grid = 1 AND STATUS = 1 )
+         AND STATUS = 1 )
         UNION ALL
         (
         SELECT id, Operation_Id, Power_Station_Id, Line_Id
@@ -22,20 +22,20 @@
         <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
-        AND Is_Up_To_Grid = 1 AND STATUS = 1 )
+         AND STATUS = 1 )
         UNION ALL
         ( SELECT id, Operation_Id, Power_Station_Id, Line_Id
         FROM pms_power_distributionarea WHERE org_id IN
         <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
-        AND Is_Up_To_Grid = 1 AND STATUS = 1 )
+         AND STATUS = 1 )
         UNION ALL
         ( SELECT id, Operation_Id, Powerr_Id, Line_Id FROM pms_monitor WHERE org_id IN
         <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
-        AND Is_Up_To_Grid = 1 AND STATUS = 1 )
+         AND STATUS = 1 )
         ) t
         INNER JOIN pms_distribution_monitor b ON t.id = b.Monitor_Id
     </select>

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AreaLineInfoVO.java

@@ -83,6 +83,30 @@ public class AreaLineInfoVO implements Serializable {
     @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;
+
     @ApiModelProperty(name = "tail",value = "总数")
     private Integer tail;
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java

@@ -25,10 +25,7 @@ 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.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -280,4 +277,18 @@ public class GeneralDeviceInfoController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,onlineRateByDevIds,methodDescribe);
     }
 
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/deptGetRunLine")
+    @ApiOperation("根据单位获取投运监测点")
+    @ApiImplicitParam(name = "deptId", value = "单位部门索引", required = true)
+    public HttpResult<List<RStatOnlinerateVO>> deptGetRunLine(@RequestParam("deptId")String deptId) {
+        String methodDescribe = getMethodDescribe("deptGetRunLine");
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,null,methodDescribe);
+    }
+
+
+
+
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml

@@ -498,6 +498,13 @@
         detail.pt1,
         detail.pt2,
         detail.obj_name,
+        detail.Dev_Capacity,
+        detail.Short_Capacity,
+        detail.Standard_Capacity,
+        detail.Deal_Capacity,
+        detail.Calssification_Grade,
+        detail.Superiors_Substation,
+        detail.Hang_Line,
         loadtype.name loadType
         FROM
         pq_line line,

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java

@@ -725,4 +725,12 @@ public class GeneralDeviceService {
 
 
     }
+
+
+    public List<String> deptGetRunLine(String deptId){
+        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(deptId, Stream.of(0, 1).collect(Collectors.toList())).getData();
+
+        return null;
+
+    }
 }

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;
+    }
+}

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/NormalLimitServiceImpl.java

@@ -421,7 +421,7 @@ public class NormalLimitServiceImpl extends ServiceImpl<AbnormalMapper, MpSurplu
                         }
                     }
 
-                    String sqlData_Ih = "select " + tem2 + " from data_inharmrate_v "+bang+ " and value_type = 'CP95'" + InfluxDBPublicParam.TIME_ZONE;
+                    String sqlData_Ih = "select " + tem2 + " from data_inharm_v "+bang+ " and value_type = 'CP95'" + InfluxDBPublicParam.TIME_ZONE;
                     List<Map<String, Object>> mapData_Ih = influxDbUtils.getMapResult(sqlData_Ih);
                     if (CollUtil.isNotEmpty(mapData_Ih)) {
                         List<String> useList = new ArrayList<>();
@@ -508,7 +508,7 @@ public class NormalLimitServiceImpl extends ServiceImpl<AbnormalMapper, MpSurplu
                         }
 
                         if (CollUtil.isNotEmpty(useList)) {
-                            assTest(useList,bang,"data_inharmrate_v",3,mpSurplusAbnormalDMax,mpSurplusAbnormalDMin,mpSurplusAbnormalDAvg);
+                            assTest(useList,bang,"data_inharm_v",3,mpSurplusAbnormalDMax,mpSurplusAbnormalDMin,mpSurplusAbnormalDAvg);
                         }
                     }