1.配网三类用户调整

2.国网上送接口调整

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

@@ -22,4 +22,6 @@ public class PwUserMonitorParam extends BaseParam {
 
     private List<String> ids;
 
+    private String monitorState;
+
 }

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

@@ -519,7 +519,8 @@
         pms_distribution_monitor
         inner join pms_power_client on pms_distribution_monitor.Monitor_Id = pms_power_client.id
         left join pms_real_data on pms_power_client.id = pms_real_data.line_id and pms_real_data.value_type = "AVG"
-        WHERE pms_power_client.org_id in
+        WHERE pms_distribution_monitor.Monitor_State = #{param.monitorState}
+        and pms_power_client.org_id in
         <foreach collection="deptIds" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DistributionMonitorServiceImpl.java

@@ -478,6 +478,8 @@ public class DistributionMonitorServiceImpl extends MppServiceImpl<DistributionM
     @Override
     public List<PwUserMonitorDataVO> getPwUserIds(PwUserMonitorParam pwUserMonitorParam) {
         List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(pwUserMonitorParam.getOrgId()).getData();
+        DictData dictData = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.RUN.getCode(), DicDataTypeEnum.LINE_STATE.getCode()).getData();
+        pwUserMonitorParam.setMonitorState(dictData.getId());
         return this.distributionMonitorMapper.getDistributionList(deptIds,pwUserMonitorParam);
     }
 

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/api/UploadGwDataFeignClient.java

@@ -3,6 +3,7 @@ package com.njcn.harmonic.api;
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.harmonic.api.fallback.UploadGwDataFallbackFactory;
+import com.njcn.harmonic.pojo.param.UploadDataParam;
 import com.njcn.harmonic.pojo.param.UploadParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,6 +29,6 @@ public interface UploadGwDataFeignClient {
     HttpResult<String> uploadEvaluationData(@RequestBody UploadParam param);
 
     @PostMapping("/upGwCommPoint")
-    HttpResult<String> upGwCommPoint(@RequestBody UploadParam param);
+    HttpResult<String> upGwCommPoint(@RequestBody UploadDataParam param);
 
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/api/fallback/UploadGwDataFallbackFactory.java

@@ -4,6 +4,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.harmonic.api.UploadGwDataFeignClient;
+import com.njcn.harmonic.pojo.param.UploadDataParam;
 import com.njcn.harmonic.pojo.param.UploadParam;
 import com.njcn.harmonic.utils.HarmonicEnumUtil;
 import feign.hystrix.FallbackFactory;
@@ -47,7 +48,7 @@ public class UploadGwDataFallbackFactory implements FallbackFactory<UploadGwData
             }
 
             @Override
-            public HttpResult<String> upGwCommPoint(UploadParam param) {
+            public HttpResult<String> upGwCommPoint(UploadDataParam param) {
                 log.error("{}异常，降级处理，异常为：{}", "国网上送-公共连接点数据", throwable.toString());
                 return new HttpResult<>(CommonResponseEnum.FAIL.getCode(),CommonResponseEnum.FAIL.getMessage());
             }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemUserController.java

@@ -1,6 +1,19 @@
 package com.njcn.harmonic.controller.upload;
 
 
+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.harmonic.pojo.param.UploadDataParam;
+import com.njcn.harmonic.service.upload.IPmsTemUserService;
+import com.njcn.harmonic.service.upload.impl.PmsTemUserServiceImpl;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+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;
@@ -16,7 +29,21 @@ import com.njcn.web.controller.BaseController;
  */
 @RestController
 @RequestMapping("/process/pmsTemUser")
+@RequiredArgsConstructor
 public class PmsTemUserController extends BaseController {
 
+    private final IPmsTemUserService iPmsTemUserService;
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/upGwTemUser")
+    @ApiOperation("上送国网")
+    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
+    public HttpResult<Boolean> upGwTemUser(@RequestBody UploadDataParam param) {
+        String methodDescribe = getMethodDescribe("upGwTemUser");
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+    }
+
 }
 

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

@@ -460,18 +460,23 @@ public class RStatLimitServiceImpl implements RStatLimitService {
                 PwUserMonitorDataVO pwUserMonitorDataVO = map.get(item.getLineId());
                 BeanUtil.copyProperties(pwUserMonitorDataVO,monitorLimitRateVO);
                 if(item.getAllTime() == 0){
-                    monitorLimitRateVO.setFlickerOvertime(BigDecimal.valueOf(3.14159));
                     monitorLimitRateVO.setFreqDevOvertime(BigDecimal.valueOf(3.14159));
                     monitorLimitRateVO.setUaberranceOvertime(BigDecimal.valueOf(3.14159));
                     monitorLimitRateVO.setUbalanceOvertime(BigDecimal.valueOf(3.14159));
                     monitorLimitRateVO.setVoltageDevOvertime(BigDecimal.valueOf(3.14159));
                 }else {
-                    monitorLimitRateVO.setFlickerOvertime(calculatePercentage(item.getFlickerOvertime(),item.getFlickerAllTime()));
                     monitorLimitRateVO.setFreqDevOvertime(calculatePercentage(item.getFreqDevOvertime(),item.getAllTime()));
                     monitorLimitRateVO.setUaberranceOvertime(calculatePercentage(item.getUaberranceOvertime(),item.getAllTime()));
                     monitorLimitRateVO.setUbalanceOvertime(calculatePercentage(item.getUbalanceOvertime(),item.getAllTime()));
                     monitorLimitRateVO.setVoltageDevOvertime(calculatePercentage(item.getVoltageDevOvertime(),item.getAllTime()));
                 }
+
+                if(item.getFlickerAllTime() == 0){
+                    monitorLimitRateVO.setFlickerOvertime(BigDecimal.valueOf(3.14159));
+                }else {
+                    monitorLimitRateVO.setFlickerOvertime(calculatePercentage(item.getFlickerOvertime(),item.getFlickerAllTime()));
+                }
+
                 setUharmOvertimeRatios(item,monitorLimitRateVO);
                 resultList.add(monitorLimitRateVO);
             }