手动新增技术监督及越限监测点数据

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/ThsSuperviseClient.java

@@ -3,9 +3,14 @@ package com.njcn.prepare.harmonic.api.line;
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.prepare.harmonic.api.line.fallback.CoustomReportFeignClientFallbackFactory;
+import com.njcn.prepare.harmonic.pojo.param.SuperviseParam;
+import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 @FeignClient(
         value = ServerInfo.PREPARE_BOOT,//对应模块名
@@ -16,9 +21,9 @@ public interface ThsSuperviseClient {
     /**
      * 预警/告警事务的生成
      *
-     * @param initType 生成方式 0 自动；1 手动
+     * @param superviseParam
      * @return
      */
     @PostMapping("/initSupervise")
-    HttpResult<Boolean> initSupervise(@RequestParam("initType") Integer initType);
+    HttpResult<List<ThsOverRunLog>> initSupervise(@RequestBody @Validated SuperviseParam superviseParam);
 }

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/ThsSuperviseClientFallbackFactory.java

@@ -5,10 +5,15 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pq.utils.DeviceEnumUtil;
 import com.njcn.prepare.harmonic.api.line.ThsSuperviseClient;
+import com.njcn.prepare.harmonic.pojo.param.SuperviseParam;
+import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 @Slf4j
 @Component
@@ -23,7 +28,7 @@ public class ThsSuperviseClientFallbackFactory implements FallbackFactory<ThsSup
         Enum<?> finalExceptionEnum = exceptionEnum;
         return new ThsSuperviseClient() {
             @Override
-            public HttpResult<Boolean> initSupervise(@RequestParam("initType") Integer initType) {
+            public HttpResult<List<ThsOverRunLog>> initSupervise(@RequestBody @Validated SuperviseParam superviseParam) {
                 log.error("{}异常，降级处理，异常为：{}", "预警/告警事务的生成:  ", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }

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

@@ -0,0 +1,20 @@
+package com.njcn.prepare.harmonic.pojo.param;
+
+import com.njcn.prepare.harmonic.pojo.po.ThsOverRunLog;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class SuperviseParam {
+
+    @ApiModelProperty(name = "initType", value = "创建类型： 0自动；1手动", required = true)
+    @NotNull(message = "创建类型不可为空")
+    private Integer initType;
+    @ApiModelProperty(name = "deptId", value = "部门id")
+    private String deptId;
+    @ApiModelProperty(name = "overRunLog", value = "监测点集合")
+    private List<ThsOverRunLog> overRunLog;
+}

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/ThsOverRunLog.java

@@ -0,0 +1,95 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 告警/预警监测点列表
+ * </p>
+ *
+ * @author lxp
+ * @since 2023-03-16
+ */
+@Data
+@TableName("ths_over_run_log")
+public class ThsOverRunLog {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(name = "id", value = "主键", required = true)
+    private String id;
+
+    /**
+     * 监测点ID
+     */
+    @ApiModelProperty(name = "lineIndex", value = "监测点ID", required = true)
+    private String lineIndex;
+
+    /**
+     * 名称（变电站_监测点_日期_id）
+     */
+    @ApiModelProperty(name = "name", value = "名称", required = true)
+    private String name;
+
+    /**
+     * 技术监督Guid
+     */
+    @ApiModelProperty(name = "supIndex", value = "技术监督Guid", required = true)
+    private String supIndex;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty(name = "description", value = "描述")
+    private String description;
+
+    /**
+     * 预/告警单
+     */
+    private String alarmTicket;
+
+    /**
+     * 反馈单
+     */
+    private String feedback;
+
+    /**
+     * 测试报告
+     */
+    private String testReport;
+
+    /**
+     * 整改通知单
+     */
+    private String reviseNotice;
+
+    /**
+     * 整改通知反馈单
+     */
+    private String reviseFeedback;
+    /**
+     * 越限时间（yyyy-MM-dd）
+     */
+    @ApiModelProperty(name = "updateTime", value = "越限时间", required = true)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "createTime", value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+
+}

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/ThsSupervise.java

@@ -0,0 +1,88 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author lxp
+ * @since 2023-03-16
+ */
+@Data
+@TableName("ths_supervise")
+public class ThsSupervise {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 技术监督Guid
+     */
+    private String supIndex;
+    /**
+     * 部门id
+     */
+    private String deptId;
+
+    /**
+     * 技术监督名称
+     */
+    private String name;
+
+    /**
+     * 创建用户(pqs_user外键)
+     */
+    private String createUser;
+
+
+    /**
+     * 处理用户
+     */
+    private String modifyUser;
+
+    /**
+     * 处理时间
+     */
+    private Date modifyTime;
+
+    /**
+     * 类型（0：预警；1：告警）
+     */
+    private Integer type;
+
+    /**
+     * 上一级处理处理人员
+     */
+    private String upUser;
+
+    /**
+     * 下一级处理人员
+     */
+    private String nextUser;
+
+    /**
+     * 进度（0：开始；1：预/告警单下发；2：反馈单上传；3：现场测试；4：整改通知单下发:5：整改通知反馈单；6：完结）默认进度为开始
+     */
+    private Integer progress;
+
+    /**
+     * 描述
+     */
+    private String description;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 创建类型(0：自动；1 手动)
+     */
+    private Integer createType;
+
+
+
+
+}