高低电压穿越功能优化

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserLedgerFeignClient.java

@@ -2,12 +2,10 @@ package com.njcn.supervision.api;
 
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.supervision.api.fallback.TempLineRunTestFeignClientFallbackFactory;
 import com.njcn.supervision.api.fallback.UserLedgerFeignClientFallbackFactory;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
-import com.njcn.supervision.pojo.po.user.UserReportPO;
+import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
-import com.njcn.supervision.pojo.vo.user.UserReportVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,4 +31,7 @@ public interface UserLedgerFeignClient {
 
     @PostMapping(value = "/bindUserStation")
     HttpResult<List<UserLedgerVO>> bindUserStation(@RequestParam("userId")String userId,@RequestParam("stationId")String stationId);
+
+    @PostMapping("/getUserReportByIds")
+    HttpResult<List<NewUserReportVO>> getUserReportByIds(@RequestBody List<String> ids);
 }

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserLedgerFeignClientFallbackFactory.java

@@ -3,12 +3,10 @@ package com.njcn.supervision.api.fallback;
 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.supervision.api.TempLineRunTestFeignClient;
 import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
-import com.njcn.supervision.pojo.po.user.UserReportPO;
+import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
-import com.njcn.supervision.pojo.vo.user.UserReportVO;
 import com.njcn.supervision.utils.SupervisionEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -48,6 +46,12 @@ public class UserLedgerFeignClientFallbackFactory implements FallbackFactory<Use
                 log.error("{}异常，降级处理，异常为：{}", "用户电站信息绑定", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<List<NewUserReportVO>> getUserReportByIds(List<String> ids) {
+                log.error("{}异常，降级处理，异常为：{}", "根据ids获取非电网侧用户信息", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/NewUserReportVO.java

@@ -0,0 +1,39 @@
+package com.njcn.supervision.pojo.vo.user;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * @author web2023
+ */
+@Data
+public class NewUserReportVO {
+
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    /**
+     * 监测点id
+     */
+    @ApiModelProperty(value = "lineId")
+    private String lineId;
+
+    /**
+     * 工程名称
+     */
+    @ApiModelProperty(value = "工程名称")
+    private String projectName;
+
+    /**
+     * 额定功率 单位MW
+     */
+    @ApiModelProperty(value = "额定功率 单位MW")
+    private Double ratePower;
+
+
+
+}

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/SurveyPlanController.java

@@ -108,5 +108,9 @@ public class SurveyPlanController extends BaseController {
         Boolean b = surveyPlanService.deleteSurveyPlan(supervisionId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
     }
+
+
+
+
 }
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java

@@ -10,6 +10,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.po.user.UserReportPO;
+import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import com.njcn.supervision.pojo.vo.user.UserReportVO;
 import com.njcn.supervision.service.user.IUserReportNormalService;
@@ -283,7 +284,14 @@ public class UserReportManageController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe);
     }
 
-
+    @PostMapping("/getUserReportByIds")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("根据ids获取非电网侧用户信息")
+    public HttpResult<List<NewUserReportVO>> getUserReportByIds(@RequestBody List<String> ids) {
+        String methodDescribe = getMethodDescribe("getUserReportByIds");
+        List<NewUserReportVO> userReportByIds = userReportNormalService.getUserReportByIds(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userReportByIds, methodDescribe);
+    }
 
 
 }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/IUserReportNormalService.java

@@ -6,8 +6,11 @@ import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
 import com.njcn.bpm.service.IBpmService;
 import com.njcn.supervision.pojo.param.user.UserReportNormalParam;
 import com.njcn.supervision.pojo.po.user.UserReportNormalPO;
+import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
 import com.njcn.supervision.pojo.vo.user.UserReportVO;
 
+import java.util.List;
+
 /**
  * <p>
  * 干扰源用户常态化管理 服务类
@@ -32,4 +35,6 @@ public interface IUserReportNormalService extends IBpmService<UserReportNormalPO
     String cancelUserReport(BpmProcessInstanceCancelParam cancelReqVO);
 
     UserReportVO.UserReportListVO getUserReportByFangAnId(String id);
+
+    List<NewUserReportVO> getUserReportByIds(List<String> ids);
 }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java

@@ -20,6 +20,7 @@ import com.njcn.supervision.enums.UserNatureEnum;
 import com.njcn.supervision.mapper.user.UserReportNormalMapper;
 import com.njcn.supervision.pojo.param.user.UserReportNormalParam;
 import com.njcn.supervision.pojo.po.user.*;
+import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
 import com.njcn.supervision.pojo.vo.user.UserReportVO;
 import com.njcn.supervision.service.user.*;
 import com.njcn.supervision.utils.InstanceUtil;
@@ -281,4 +282,16 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
         userReportVO.setGovernReport(Collections.singletonList(governReport.orElse(null)));
         return userReportVO;
     }
+
+    @Override
+    public List<NewUserReportVO> getUserReportByIds(List<String> ids) {
+        List<UserReportPO> userReportPOS = userReportPOService.listByIds(ids);
+        List<NewUserReportVO> info = new ArrayList<>();
+        for (UserReportPO userReportNormalPO : userReportPOS) {
+            NewUserReportVO newUserReportVO = new NewUserReportVO();
+            BeanUtil.copyProperties(userReportNormalPO, newUserReportVO);
+            info.add(newUserReportVO);
+        }
+        return info;
+    }
 }