1.下发接口修改

2.工单接口开发

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/upload/FeedbackInfoDTO.java

@@ -0,0 +1,43 @@
+package com.njcn.harmonic.pojo.dto.upload;
+
+import lombok.Data;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2024/6/18
+ */
+@Data
+public class FeedbackInfoDTO {
+
+    /**
+     * 主键
+     */
+    private String objId;
+
+    /**
+     * 工单编号
+     */
+    private String orderId;
+
+    /**
+     * 是否反馈
+     */
+    private String isFeedback;
+
+    /**
+     * 反馈人员
+     */
+    private String feedbackUser;
+
+    /**
+     * 反馈时间
+     */
+    private String feedbackTime;
+
+    /**
+     * 处理措施
+     */
+    private String handlingMeasures;
+}

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/DimBusBarParam.java

@@ -13,38 +13,44 @@ import java.util.List;
 @Data
 public class DimBusBarParam {
 
-    private String deployState;
+    private Integer pageNum;
+    private Integer pageSize;
     private String endTime;
     private String startTime;
     private String orgId;
     private String orgLevel;
+
+    private String deployState;
     private String statType;
 
 
 
-
+    private String dataSource;
+    private String indexType;
+    private Integer harmonicNum;
+    private String stationName;
+    private String voltageLevel;
 
 
 
     private String busId;
+
+
     private List<String> busIds;
     private String busName;
-    private String dataSource;
+
 
     private String detailType;
 
-    private Integer harmonicNum;
-    private String indexType;
+
     private String monitorId;
     private String nodeId;
     private String nodeLevel;
     private List<String> seqs;
     private String statDate;
 
-    private String stationName;
-    private String voltageLevel;
-    private Integer pageNum;
-    private Integer pageSize;
+
+
 
 
     private List<String> onlineBusIds;

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/RUploadWorkOrderParam.java

@@ -0,0 +1,182 @@
+package com.njcn.harmonic.pojo.param.upload;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.web.pojo.param.BaseParam;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用于存储总部下发的工单信息
+ * </p>
+ *
+ * @author cdf
+ * @since 2024-06-18
+ */
+@Data
+public class RUploadWorkOrderParam {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private String objId;
+
+    /**
+     * 省公司id
+     */
+    private String provinceId;
+
+    /**
+     * 省公司名称
+     */
+    private String provinceName;
+
+    /**
+     * 市公司
+     */
+    private String cityOrgId;
+
+    /**
+     * 市公司名称
+     */
+    private String cityOrgName;
+
+    /**
+     * 运维单位ID
+     */
+    private String maintainerId;
+
+    /**
+     * 运维单位名称
+     */
+    private String maintainerName;
+
+    /**
+     * 运维班组Id
+     */
+    private String maintcrewId;
+
+    /**
+     * 运维班组名称
+     */
+    private String maintcrewName;
+
+    /**
+     * 工单编号
+     */
+    private String orderId;
+
+    /**
+     * 工单类型（字典）
+     */
+    private String orderType;
+
+    /**
+     * 工单来源（字典）
+     */
+    private String orderSource;
+
+    /**
+     * 业务分类（字典）
+     */
+    private String businessType;
+
+    /**
+     * 工单内容
+     */
+    private String orderContent;
+
+    /**
+     * 事件时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate eventTime;
+
+    /**
+     * 下发时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime distributeTime;
+
+    /**
+     * 闭环时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate closedLoopTime;
+
+
+    /**
+     * 3-省，4-市
+     */
+    private String orgLevel;
+
+    /**
+     * 0-否，1-是
+     */
+    private String isFeedback;
+
+    /**
+     * 反馈人员
+     */
+    private String feedbackUser;
+
+    /**
+     * 反馈时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate feedbackTime;
+
+    /**
+     * 处理措施
+     */
+    private String handlingMeasures;
+
+    /**
+     * 接收时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime receiveTime;
+
+    /**
+     * 0-否，1-是
+     */
+    private String uploadStatus;
+
+    /**
+     * 工单状态(字典)
+     */
+    private String orderStatus;
+
+    /**
+     * 上报时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate uploadTime;
+
+    /**
+     * 下发人员
+     */
+    private String distributeUser;
+
+    /**
+     * 要求整改时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate planRectificationTime;
+
+
+
+    @Data
+    public static class RUploadWorkOrderQuery extends BaseParam {
+
+    }
+
+
+}

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RUploadWorkOrderPO.java

@@ -0,0 +1,177 @@
+package com.njcn.harmonic.pojo.po.upload;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 用于存储总部下发的工单信息
+ * </p>
+ *
+ * @author cdf
+ * @since 2024-06-18
+ */
+@Getter
+@Setter
+@TableName("r_upload_work_order")
+public class RUploadWorkOrderPO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId("obj_Id")
+    private String objId;
+
+    /**
+     * 省公司id
+     */
+    private String provinceId;
+
+    /**
+     * 省公司名称
+     */
+    private String provinceName;
+
+    /**
+     * 市公司
+     */
+    private String cityOrgId;
+
+    /**
+     * 市公司名称
+     */
+    private String cityOrgName;
+
+    /**
+     * 运维单位ID
+     */
+    private String maintainerId;
+
+    /**
+     * 运维单位名称
+     */
+    private String maintainerName;
+
+    /**
+     * 运维班组Id
+     */
+    private String maintcrewId;
+
+    /**
+     * 运维班组名称
+     */
+    private String maintcrewName;
+
+    /**
+     * 工单编号
+     */
+    private String orderId;
+
+    /**
+     * 工单类型（字典）
+     */
+    private String orderType;
+
+    /**
+     * 工单来源（字典）
+     */
+    private String orderSource;
+
+    /**
+     * 业务分类（字典）
+     */
+    private String businessType;
+
+    /**
+     * 工单内容
+     */
+    private String orderContent;
+
+    /**
+     * 事件时间
+     */
+    private LocalDate eventTime;
+
+    /**
+     * 下发时间
+     */
+    private LocalDateTime distributeTime;
+
+    /**
+     * 闭环时间
+     */
+    private LocalDate closedLoopTime;
+
+    private LocalDateTime ctime;
+
+    private LocalDateTime mtime;
+
+    /**
+     * 0.删除 1.正常
+     */
+    private Boolean isDeleted;
+
+    /**
+     * 3-省，4-市
+     */
+    private String orgLevel;
+
+    /**
+     * 0-否，1-是
+     */
+    private String isFeedback;
+
+    /**
+     * 反馈人员
+     */
+    private String feedbackUser;
+
+    /**
+     * 反馈时间
+     */
+    private LocalDate feedbackTime;
+
+    /**
+     * 处理措施
+     */
+    private String handlingMeasures;
+
+    /**
+     * 接收时间
+     */
+    private LocalDateTime receiveTime;
+
+    /**
+     * 0-否，1-是
+     */
+    private String uploadStatus;
+
+    /**
+     * 工单状态(字典)
+     */
+    private String orderStatus;
+
+    /**
+     * 上报时间
+     */
+    private LocalDate uploadTime;
+
+    /**
+     * 下发人员
+     */
+    private String distributeUser;
+
+    /**
+     * 要求整改时间
+     */
+    private LocalDate planRectificationTime;
+
+
+}

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/upload/DimBusBarVO.java

@@ -11,6 +11,9 @@ import lombok.Data;
 @Data
 public class DimBusBarVO {
 
+    private String midId;
+    private String lineId;
+
     private String astId;
     private String busName;
     private String busVoltageLevel;
@@ -64,7 +67,6 @@ public class DimBusBarVO {
         private String whetherOptimalName;
 
 
-
         private String maintOrg;
         private String  maintOrgName;
         private String  monitorId;
@@ -80,7 +82,7 @@ public class DimBusBarVO {
 
     @Data
     public static class DimBusBarMonitorVoltageVO{
-        private String actualCollectNum;
+
         private String busId;
         private String busName;
         private String busVoltageLevel;
@@ -103,4 +105,81 @@ public class DimBusBarVO {
         private String whetherOptimalName;
     }
 
+
+    /**
+     * 母线下有效测点
+     * @author cdf
+     * @date 2024/6/17
+     */
+    @Data
+    public static class DimBusBarEffectMonitorVO{
+        private String busId;
+        private String busName;
+        private String busVoltageLevel;
+        private String busVoltageLevelName;
+        private String cityOrg;
+        private String cityOrgName;
+        private String maintOrg;
+        private String maintOrgName;
+        private String monitorId;
+        private String monitorName;
+        private String stationId;
+        private String stationName;
+        private String status;
+        private String statusName;
+    }
+
+
+    /**
+     * 母线下有效测点
+     * @author cdf
+     * @date 2024/6/17
+     */
+    @Data
+    public static class DimBusBarMonitorScaleVO{
+        private Integer actualCollectNum;
+        private String busId;
+        private String busName;
+        private String busVoltageLevel;
+        private String busVoltageLevelName;
+        private String cityOrg;
+        private String cityOrgName;
+        private String monitorId;
+        private String monitorName;
+        private Double dataFullRate;
+        private Integer expectCollectNum;
+        private String maintOrg;
+        private String maintOrgName;
+        private String statDate;
+        private String stationId;
+        private String stationName;
+        private String status;
+        private String statusName;
+        private String whetherOptimal;
+        private String whetherOptimalName;
+    }
+
+
+    @Data
+    public static class DimBusBarMonitorAvgVO{
+        private String busName;
+        private String cityOrg;
+        private String cityOrgName;
+        private String harmonicNum;
+        private String indexValue;
+        private String lineVoltage;
+        private String maintOrg;
+        private String maintOrgName;
+        private String monitorId;
+        private String monitorName;
+        private String seq;
+        private String statDate;
+        private String stationId;
+        private String stationName;
+        private String status;
+        private String statusName;
+        private String terminalConnect;
+        private String terminalConnectName;
+    }
+
 }