getEventDetailByLineId(@RequestBody StatisticsBizBaseParam param) {
String methodDescribe = getMethodDescribe("getEventDetailByLineId");
- RMpEventDetailMPO eventDetailByLine = rmpEventDetailService.getEventDetailByLine(param);
+ RMpEventDetailM eventDetailByLine = rmpEventDetailService.getEventDetailByLine(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eventDetailByLine, methodDescribe);
}
}
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RMpEventDetailMMapper.java b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RMpEventDetailMMapper.java
index b1c9efc09..9ae1cb5ba 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RMpEventDetailMMapper.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RMpEventDetailMMapper.java
@@ -1,7 +1,7 @@
package com.njcn.event.mapper.majornetwork;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.po.RMpEventDetailMPO;
+import com.njcn.event.pojo.po.RMpEventDetailM;
/**
*
@@ -11,6 +11,6 @@ import com.njcn.harmonic.pojo.po.RMpEventDetailMPO;
* @author wr
* @since 2024-05-04
*/
-public interface RMpEventDetailMMapper extends BaseMapper {
+public interface RMpEventDetailMMapper extends BaseMapper {
}
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java
index 5e542102d..1fb30f5ad 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java
@@ -38,10 +38,9 @@ import com.njcn.event.mapper.majornetwork.RmpEventDetailMapper;
import com.njcn.event.pojo.param.UniversalFrontEndParam;
import com.njcn.event.pojo.po.RmpEventDetailPO;
import com.njcn.event.pojo.vo.*;
-import com.njcn.event.service.majornetwork.EventDetailService;
import com.njcn.event.service.majornetwork.RmpEventDetailService;
import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RMpEventDetailMPO;
+import com.njcn.event.pojo.po.RMpEventDetailM;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.enums.DicDataTypeEnum;
@@ -384,13 +383,13 @@ public class RmpEventDetailServiceImpl extends ServiceImpl()
- .eq(RMpEventDetailMPO::getMeasurementPointId, param.getId())
- .ge(StrUtil.isNotBlank(param.getStartTime()), RMpEventDetailMPO::getDataDate, DateUtil.beginOfDay(DateUtil.parse(param.getStartTime())))
- .le(StrUtil.isNotBlank(param.getEndTime()), RMpEventDetailMPO::getDataDate, DateUtil.endOfDay(DateUtil.parse(param.getEndTime())))
+ public RMpEventDetailM getEventDetailByLine(StatisticsBizBaseParam param) {
+ RMpEventDetailM rMpEventDetailM = eventDetailMMapper.selectOne(new LambdaQueryWrapper()
+ .eq(RMpEventDetailM::getMeasurementPointId, param.getId())
+ .ge(StrUtil.isNotBlank(param.getStartTime()), RMpEventDetailM::getDataDate, DateUtil.beginOfDay(DateUtil.parse(param.getStartTime())))
+ .le(StrUtil.isNotBlank(param.getEndTime()), RMpEventDetailM::getDataDate, DateUtil.endOfDay(DateUtil.parse(param.getEndTime())))
);
- return rMpEventDetailMPO;
+ return rMpEventDetailM;
}
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/RmpEventDetailService.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/RmpEventDetailService.java
index 5c6956d2d..2f9484e90 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/RmpEventDetailService.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/RmpEventDetailService.java
@@ -11,7 +11,7 @@ import com.njcn.event.pojo.vo.AdvanceEventDetailVO;
import com.njcn.event.pojo.vo.EventDetailVO;
import com.njcn.event.pojo.vo.RmpEventDetailVO;
import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
-import com.njcn.harmonic.pojo.po.RMpEventDetailMPO;
+import com.njcn.event.pojo.po.RMpEventDetailM;
import com.njcn.system.pojo.po.DictData;
import com.njcn.web.pojo.param.BaseParam;
@@ -72,5 +72,5 @@ public interface RmpEventDetailService extends IService {
* @Author: wr
* @Date: 2024/5/4 17:08
*/
- RMpEventDetailMPO getEventDetailByLine(StatisticsBizBaseParam param);
+ RMpEventDetailM getEventDetailByLine(StatisticsBizBaseParam param);
}
diff --git a/pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java b/pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java
index 2abb1ff52..f654051d5 100644
--- a/pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java
+++ b/pqs-gateway/src/main/java/com/njcn/gateway/utils/IpUtils.java
@@ -4,6 +4,9 @@ import cn.hutool.core.util.StrUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpHeaders;
import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.web.reactive.function.server.ServerRequest;
+import org.springframework.web.server.ServerWebExchange;
+
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -80,7 +83,23 @@ public class IpUtils {
ipAddress = ipAddress.substring(0, index);
}
}
- return ipAddress;
+
+ String clientIp = request.getHeaders().getFirst("X-Forwarded-For");
+ if (clientIp == null || clientIp.isEmpty() || "unknown".equalsIgnoreCase(clientIp)) {
+ clientIp = request.getHeaders().getFirst("X-Real-IP");
+ if (clientIp == null || clientIp.isEmpty() || "unknown".equalsIgnoreCase(clientIp)) {
+ clientIp = request.getRemoteAddress().getAddress().getHostAddress();
+ }
+ } else {
+ // X-Forwarded-For 头可能包含多个 IP，取第一个
+ int index = clientIp.indexOf(',');
+ if (index > 0) {
+ clientIp = clientIp.substring(0, index).trim();
+ }
+ }
+ System.out.println("new------:"+clientIp);
+// System.out.println("old------:"+ipAddress);
+ return clientIp;
}
/**
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/RMpMonitorEvaluateDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/algorithm/line/RMpMonitorEvaluateD.java
similarity index 84%
rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/RMpMonitorEvaluateDPO.java
rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/algorithm/line/RMpMonitorEvaluateD.java
index 36d901577..f7d3840df 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/RMpMonitorEvaluateDPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/algorithm/line/RMpMonitorEvaluateD.java
@@ -1,29 +1,20 @@
-package com.njcn.prepare.harmonic.pojo.mysql;
+package com.njcn.harmonic.pojo.po.algorithm.line;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
-import java.util.Date;
/**
- *
- * Description:
- * 接口文档访问地址：http://serverIP:port/swagger-ui.html
- * Date: 2023/4/19 15:42【需求编号】
- *
+ * 监测点评价表
* @author clam
* @version V1.0.0
*/
-/**
- * 监测点评价表
- */
@Data
@TableName(value = "r_mp_monitor_evaluate_d")
-public class RMpMonitorEvaluateDPO {
+public class RMpMonitorEvaluateD {
/**
* 监测点Id
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/bo/CalculatedParam.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/bo/CalculatedParam.java
index 8c968310d..a19da4289 100644
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/bo/CalculatedParam.java
+++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/bo/CalculatedParam.java
@@ -30,6 +30,12 @@ public class CalculatedParam implements Serializable {
@ApiModelProperty(name = "repair",value = "是否补招")
private boolean repair;
+ /**
+ * 日期_yyyy-MM-dd
+ */
+ @ApiModelProperty(name = "dataDate",value = "时间日期_yyyy-MM-dd")
+ private String dataDate;
+
/***
* 需要执行的组件
* 当不需要全链路执行时，通过tag名称动态指定执行某个算法组件
@@ -37,10 +43,6 @@ public class CalculatedParam implements Serializable {
@ApiModelProperty(name = "tagNames",value = "待执行链节点的tag集合")
private Set tagNames;
-
- @ApiModelProperty(name = "dataDate",value = "时间日期_yyyy-MM-dd")
- private String dataDate;
-
/**
* 待计算的对象索引集合，监测点、设备、母线、变电站、单位下监测点等等
*/
diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/RMpEventDetailPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/RMpEventDetailPO.java
deleted file mode 100644
index 87047067f..000000000
--- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/RMpEventDetailPO.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package com.njcn.prepare.harmonic.pojo.mysql;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- *
- * Description:
- * 接口文档访问地址：http://serverIP:port/swagger-ui.html
- * Date: 2023/4/23 13:50【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@Data
-@TableName(value = "r_mp_event_detail")
-public class RMpEventDetailPO {
- /**
- * 暂时事件ID
- */
- @TableId(value = "event_id")
- private String eventId;
-
- /**
- * 监测点ID
- */
- @TableField(value = "measurement_point_id")
- private String measurementPointId;
-
- /**
- * 统计指标类型
- */
- @TableField(value = "event_type")
- private String eventType;
-
- /**
- * 暂降原因（字典表PQS_Dicdata）
- */
- @TableField(value = "advance_reason")
- private String advanceReason;
-
- /**
- * 暂降类型（字典表PQS_Dicdata）
- */
- @TableField(value = "advance_type")
- private String advanceType;
-
- /**
- * 事件关联分析表Guid
- */
- @TableField(value = "eventass_index")
- private String eventassIndex;
-
- @TableField(value = "dq_time")
- private Double dqTime;
-
- /**
- * 特征值计算更新时间（外键PQS_Relevance的Time字段）
- */
- @TableField(value = "deal_time")
- private Date dealTime;
-
- /**
- * 默认事件个数为0
- */
- @TableField(value = "num")
- private Integer num;
-
- /**
- * 波形文件是否从装置招到本地(0：未招，1：已招)默认值为0
- */
- @TableField(value = "file_flag")
- private Boolean fileFlag;
-
- /**
- * 特征值计算标志（0，未处理；1，已处理; 2，已处理，无结果;3，计算失败）默认值为0
- */
- @TableField(value = "deal_flag")
- private Boolean dealFlag;
-
- /**
- * 处理结果第一条事件发生时间(读comtra文件获取)
- */
- @TableField(value = "first_time")
- private Date firstTime;
-
- /**
- * 处理结果第一条事件暂降类型（字典表PQS_Dicdata）
- */
- @TableField(value = "first_type")
- private String firstType;
-
- /**
- * 处理结果第一条事件发生时间毫秒(读comtra文件获取)
- */
- @TableField(value = "first_ms")
- private BigDecimal firstMs;
-
- /**
- * 暂降能量
- */
- @TableField(value = "energy")
- private Double energy;
-
- /**
- * 暂降严重度
- */
- @TableField(value = "severity")
- private Double severity;
-
- /**
- * 暂降源与监测位置关系 Upper:上游；Lower :下游；Unknown :未知;为空则是未计算
- */
- @TableField(value = "sagsource")
- private String sagsource;
-
- /**
- * 开始时间
- */
- @TableField(value = "start_time")
- private Date startTime;
-
- /**
- * 持续时间，单位秒
- */
- @TableField(value = "duration")
- private BigDecimal duration;
-
- /**
- * 特征幅值
- */
- @TableField(value = "feature_amplitude")
- private BigDecimal featureAmplitude;
-
- /**
- * 相别
- */
- @TableField(value = "phase")
- private String phase;
-
- /**
- * 事件描述
- */
- @TableField(value = "event_describe")
- private String eventDescribe;
-
- @ApiModelProperty(value = "暂降核实原因")
- @TableField("verify_reason")
- private String verifyReason;
-
- @ApiModelProperty(value = "暂降核实原因详情")
- @TableField("verify_reason_detail")
- private String verifyReasonDetail;
-
- /**
- * 波形路径
- */
- @TableField(value = "wave_path")
- private String wavePath;
-
- /**
- * 暂态事件上送时间
- */
- @TableField(value = "create_time")
- private Date createTime;
-
- @TableField(value = "transient_value")
- private Double transientValue;
-}
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/pom.xml b/pqs-prepare/prepare-boot/pom.xml
index a5712190e..d312b54a1 100644
--- a/pqs-prepare/prepare-boot/pom.xml
+++ b/pqs-prepare/prepare-boot/pom.xml
@@ -61,6 +61,12 @@
${project.version}
compile
+
+ com.njcn
+ event-api
+ ${project.version}
+ compile
+
com.njcn
system-api
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/ExecutionCenter.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/ExecutionCenter.java
index c1895d3dc..8b8aec205 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/ExecutionCenter.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/ExecutionCenter.java
@@ -84,25 +84,25 @@ public class ExecutionCenter extends BaseController {
* @author hongawen
* @date 2023/11/7 14:44
*/
- private void dealResponse(CalculatedParam calculatedParam, LiteflowResponse liteflowResponse,String methodDescribe) {
- if(liteflowResponse.isSuccess()){
- log.info("日期{}，{}执行{}成功",calculatedParam.getDataDate(),methodDescribe,calculatedParam.isFullChain()?"全链":"指定节点：".concat(String.join(StrPool.COMMA,calculatedParam.getTagNames())));
- }else{
- Map> executeSteps = liteflowResponse.getExecuteSteps();
+ private void dealResponse(CalculatedParam calculatedParam, LiteflowResponse liteflowResponse, String methodDescribe) {
+ if (liteflowResponse.isSuccess()) {
+ log.info("日期{}，{}执行{}成功", calculatedParam.getDataDate(), methodDescribe, calculatedParam.isFullChain() ? "全链" : "指定节点：".concat(String.join(StrPool.COMMA, calculatedParam.getTagNames())));
+ } else {
+ Map> executeSteps = liteflowResponse.getExecuteSteps();
CmpStep failStep = null;
for (String key : executeSteps.keySet()) {
List cmpSteps = executeSteps.get(key);
- cmpSteps=cmpSteps.stream().filter(cmpStep -> !cmpStep.isSuccess()).collect(Collectors.toList());
- if(CollectionUtil.isNotEmpty(cmpSteps)){
+ cmpSteps = cmpSteps.stream().filter(cmpStep -> !cmpStep.isSuccess()).collect(Collectors.toList());
+ if (CollectionUtil.isNotEmpty(cmpSteps)) {
failStep = cmpSteps.get(0);
}
}
log.error("日期{}，{}执行{}失败，在执行{}失败，失败原因:{}"
- ,calculatedParam.getDataDate()
- ,methodDescribe
- ,calculatedParam.isFullChain()?"全链":"指定节点：".concat(String.join(StrPool.COMMA,calculatedParam.getTagNames()))
- ,failStep.getNodeId().concat(Objects.isNull(failStep.getTag()) ? "" :StrPool.DASHED.concat(failStep.getTag()))
- ,Objects.isNull(failStep.getException()) ? null:failStep.getException().getMessage());
+ , calculatedParam.getDataDate()
+ , methodDescribe
+ , calculatedParam.isFullChain() ? "全链" : "指定节点：".concat(String.join(StrPool.COMMA, calculatedParam.getTagNames()))
+ , failStep.getNodeId().concat(Objects.isNull(failStep.getTag()) ? "" : StrPool.DASHED.concat(failStep.getTag()))
+ , Objects.isNull(failStep.getException()) ? null : failStep.getException().getMessage());
}
}
@@ -132,12 +132,12 @@ public class ExecutionCenter extends BaseController {
}
calculatedParam.setDataDate(DateUtil.format(startDate, DatePattern.NORM_DATE_PATTERN));
liteflowResponse = flowExecutor.execute2Resp("measurement_point", calculatedParam);
- dealResponse(calculatedParam,liteflowResponse,methodDescribe);
+ dealResponse(calculatedParam, liteflowResponse, methodDescribe);
}
} else {
//非补招
liteflowResponse = flowExecutor.execute2Resp("measurement_point", calculatedParam);
- dealResponse(calculatedParam,liteflowResponse,methodDescribe);
+ dealResponse(calculatedParam, liteflowResponse, methodDescribe);
}
}
@@ -155,7 +155,7 @@ public class ExecutionCenter extends BaseController {
Dept data = deptFeignClient.getRootDept().getData();
deptGetLineParam.setDeptId(data.getId());
List list = commTerminalGeneralClient.deptGetDevice(deptGetLineParam).getData();
- DeptGetDeviceDTO dto = list.stream().filter(po ->Objects.equals(po.getUnitId(),data.getId())).collect(Collectors.toList()).get(0);
+ DeptGetDeviceDTO dto = list.stream().filter(po -> Objects.equals(po.getUnitId(), data.getId())).collect(Collectors.toList()).get(0);
List devList = dto.getDeviceList();
calculatedParam.setIdList(devList.stream().map(LineDevGetDTO::getDevId).distinct().collect(Collectors.toList()));
}
@@ -172,12 +172,12 @@ public class ExecutionCenter extends BaseController {
}
calculatedParam.setDataDate(DateUtil.format(startDate, DatePattern.NORM_DATE_PATTERN));
liteflowResponse = flowExecutor.execute2Resp("device", calculatedParam);
- dealResponse(calculatedParam,liteflowResponse,methodDescribe);
+ dealResponse(calculatedParam, liteflowResponse, methodDescribe);
}
} else {
//非补招
liteflowResponse = flowExecutor.execute2Resp("device", calculatedParam);
- dealResponse(calculatedParam,liteflowResponse,methodDescribe);
+ dealResponse(calculatedParam, liteflowResponse, methodDescribe);
}
}
@@ -309,6 +309,7 @@ public class ExecutionCenter extends BaseController {
/**
* pms dim母线，电站运行情况
+ *
* @author cdf
* @date 2023/11/17
*/
@@ -382,7 +383,7 @@ public class ExecutionCenter extends BaseController {
}
calculatedParam.setDataDate(DateUtil.format(startDate, DatePattern.NORM_DATE_PATTERN));
liteflowResponse = flowExecutor.execute2Resp("genera_trix", calculatedParam);
- dealResponse(calculatedParam,liteflowResponse,methodDescribe);
+ dealResponse(calculatedParam, liteflowResponse, methodDescribe);
}
} else {
//非补招
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailDMapper.java
index 47098adbb..aad87ff9d 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailDMapper.java
@@ -2,13 +2,12 @@ package com.njcn.prepare.harmonic.mapper.mysql.line;
import cn.hutool.core.date.DateTime;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.harmonic.pojo.po.RMpEventDetailDPO;
-import com.njcn.harmonic.pojo.po.RMpEventDetailMPO;
+import com.njcn.event.pojo.po.RMpEventDetailD;
+import com.njcn.event.pojo.po.RMpEventDetailM;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -21,7 +20,7 @@ import java.util.Map;
* @version V1.0.0
*/
@Mapper
-public interface RMpEventDetailDMapper extends MppBaseMapper {
+public interface RMpEventDetailDMapper extends MppBaseMapper {
int getSagTimes(@Param("lineId") String lineId, @Param("date") LocalDate date);
@@ -40,5 +39,5 @@ public interface RMpEventDetailDMapper extends MppBaseMapper
* @param endMonth 截止时间
* @return List
*/
- List handleMonth(@Param("lineIds") List lineIds, @Param("dataDate") String dataDate, @Param("beginMonth") DateTime beginMonth, @Param("endMonth") DateTime endMonth);
+ List handleMonth(@Param("lineIds") List lineIds, @Param("dataDate") String dataDate, @Param("beginMonth") DateTime beginMonth, @Param("endMonth") DateTime endMonth);
}
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailMMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailMMapper.java
index 4798fb930..43912cfaf 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailMMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailMMapper.java
@@ -1,7 +1,7 @@
package com.njcn.prepare.harmonic.mapper.mysql.line;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.harmonic.pojo.po.RMpEventDetailMPO;
+import com.njcn.event.pojo.po.RMpEventDetailM;
import org.apache.ibatis.annotations.Mapper;
/**
@@ -14,5 +14,5 @@ import org.apache.ibatis.annotations.Mapper;
* @version V1.0.0
*/
@Mapper
-public interface RMpEventDetailMMapper extends MppBaseMapper {
+public interface RMpEventDetailMMapper extends MppBaseMapper {
}
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailMapper.java
index d0abbbd82..9ea335322 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailMapper.java
@@ -1,8 +1,8 @@
package com.njcn.prepare.harmonic.mapper.mysql.line;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.harmonic.pojo.po.RMpEventDetailDPO;
-import com.njcn.prepare.harmonic.pojo.mysql.RMpEventDetailPO;
+import com.njcn.event.pojo.po.RMpEventDetailD;
+import com.njcn.event.pojo.po.RmpEventDetailPO;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
@@ -16,7 +16,7 @@ import java.util.List;
* @author clam
* @version V1.0.0
*/
-public interface RMpEventDetailMapper extends BaseMapper {
+public interface RMpEventDetailMapper extends BaseMapper {
/***
@@ -32,5 +32,5 @@ public interface RMpEventDetailMapper extends BaseMapper {
* @param shortInterruptions 短时中断
* @return List
*/
- List handleDay(@Param("lineIds") List lineIds, @Param("dataDate") String dataDate, @Param("beginDay") LocalDateTime beginDay, @Param("endDay") LocalDateTime endDay, @Param("voltageDip") String voltageDip, @Param("voltageRise") String voltageRise, @Param("shortInterruptions") String shortInterruptions);
+ List handleDay(@Param("lineIds") List lineIds, @Param("dataDate") String dataDate, @Param("beginDay") LocalDateTime beginDay, @Param("endDay") LocalDateTime endDay, @Param("voltageDip") String voltageDip, @Param("voltageRise") String voltageRise, @Param("shortInterruptions") String shortInterruptions);
}
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailQMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailQMapper.java
index ca4643131..155770cdc 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailQMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpEventDetailQMapper.java
@@ -2,7 +2,6 @@ package com.njcn.prepare.harmonic.mapper.mysql.line;
import cn.hutool.core.date.DateTime;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.harmonic.pojo.po.RMpEventDetailMPO;
import com.njcn.harmonic.pojo.po.RMpEventDetailQPO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpMonitorEvaluateDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpMonitorEvaluateDMapper.java
index 10d179dfb..c7c3b1a31 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpMonitorEvaluateDMapper.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpMonitorEvaluateDMapper.java
@@ -1,7 +1,7 @@
package com.njcn.prepare.harmonic.mapper.mysql.line;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.prepare.harmonic.pojo.mysql.RMpMonitorEvaluateDPO;
+import com.njcn.harmonic.pojo.po.algorithm.line.RMpMonitorEvaluateD;
/**
*
@@ -12,5 +12,5 @@ import com.njcn.prepare.harmonic.pojo.mysql.RMpMonitorEvaluateDPO;
* @author clam
* @version V1.0.0
*/
-public interface RMpMonitorEvaluateDMapper extends MppBaseMapper {
+public interface RMpMonitorEvaluateDMapper extends MppBaseMapper {
}
\ No newline at end of file
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpEventDetailDMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpEventDetailDMapper.xml
index 15dd722be..e988e53b1 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpEventDetailDMapper.xml
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpEventDetailDMapper.xml
@@ -38,7 +38,7 @@
-