普测计划

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

@@ -0,0 +1,22 @@
+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.SurveyPlanFeignClientFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+
+/**
+ * 流程实例 Api 接口
+ *
+ * @author 芋道源码
+ */
+@FeignClient(value = ServerInfo.SUPERVISION, path = "/surveyPlan", fallbackFactory = SurveyPlanFeignClientFallbackFactory.class)
+public interface SurveyPlanFeignClient {
+
+    @GetMapping("/updateSurveyPlanStatus")
+    HttpResult<Object> updateStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status);
+
+}

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

@@ -0,0 +1,37 @@
+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.SurveyPlanFeignClient;
+import com.njcn.supervision.utils.SupervisionEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author denghuajun
+ * @version 1.0.0
+ * @date 2022/3/16
+ */
+@Slf4j
+@Component
+public class SurveyPlanFeignClientFallbackFactory implements FallbackFactory<SurveyPlanFeignClient> {
+    @Override
+    public SurveyPlanFeignClient create(Throwable throwable) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) throwable.getCause();
+            exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new SurveyPlanFeignClient() {
+            @Override
+            public HttpResult<Object> updateStatus(String businessKey, Integer status) {
+                log.error("{}异常，降级处理，异常为：{}", "更新普测计划流程状态", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java

@@ -17,6 +17,7 @@ public enum SupervisionResponseEnum {
      */
     SUPERVISION_COMMON_ERROR("A00550","监督管理模块异常"),
     IMPORT_SENSITIVE_USER_ERROR("A00550","导入敏感及重要用户失败"),
+    DATA_NOT_EXISTS("A00550","数据不存在"),
     NO_POWER("A00550","不能操作非自己创建的任务！")
     ;
 

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyTest.java

@@ -39,6 +39,18 @@ public class SurveyTest extends BaseEntity implements Serializable {
      */
     private String deptId;
 
+
+    /**
+     * 0 关联系统内变电站；1 用户手动输入变电站
+     */
+    private Integer customSubstationFlag;
+
+    /**
+     * 变电站台账ID或者用户手动输入的变电站名称
+     */
+    private String substation;
+
+
     /**
      * 计划完成时间
      */

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyPlanVO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * <p>
@@ -84,5 +85,10 @@ public class SurveyPlanVO extends BaseEntity implements Serializable {
      */
     private Integer state;
 
+    /**
+     * 变电站详情
+     */
+    private List<SurveySubstation> surveySubstationList;
+
 
 }

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveySubstation.java

@@ -0,0 +1,28 @@
+package com.njcn.supervision.pojo.vo.survey;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class SurveySubstation implements Serializable {
+
+    /**
+     * 变电站名
+     */
+    private String substationName;
+
+    /**
+     * 电压等级
+     */
+    private String voltageLevel;
+
+    /**
+     * 数据来源
+     * 0：系统内
+     * 1：用户自定义
+     */
+    private Integer dataSource = 0;
+
+
+}