Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

pms台账bug提交,台账日志操作

Browse Source
This commit is contained in:
雨木c
2023-03-01 18:59:20 +08:00
parent 4d5750092f
commit 92b5b1a1e7
7 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java
View File

@@ -229,6 +229,9 @@ public class MonitorParam {
@ApiModelProperty(value = "ct变比_2")
private Float ct2;
@ApiModelProperty(value = "是否专项分析监测点")
private Integer isSpecialMonitor;

1
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java
View File

@@ -231,7 +231,6 @@ public class PmsMonitorController extends BaseController {
@ApiImplicitParam(name = "type", value = "0.主网 1.配网", required = true),
@ApiImplicitParam(name = "lineIds", value = "监测点ids", required = true)
})
@TerminalOperationLogDesc(value = "退役服役监测点",module = 6)
public HttpResult<Boolean> retirementMonitor(@NotNull(message = "监测类别不可为空") @RequestParam("type") Integer type,
@NotEmpty(message = "监测点不可为空") @RequestBody List<String> lineIds) {
String methodDescribe = getMethodDescribe("retirementMonitor");

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsTerminalLogMapper.xml
View File

@@ -13,7 +13,7 @@
left join sys_user sys_user on pms_terminal_log.create_by = sys_user.id
where pms_terminal_log.status = 1
and sys_user.state = 1
and pms_terminal_log.create_time between #{pmsTerminalLogParam.searchBeginTime} and #{pmsTerminalLogParam.searchEndTime}
and pms_terminal_log.create_time between concat(#{pmsTerminalLogParam.searchBeginTime}," 00:00:00") and concat(#{pmsTerminalLogParam.searchEndTime}," 23:59:59")
<if test="pmsTerminalLogParam.type!=null">
and pms_terminal_log.type = #{pmsTerminalLogParam.type}
</if>

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DistributionMonitorServiceImpl.java
View File

@@ -104,7 +104,7 @@ public class DistributionMonitorServiceImpl extends ServiceImpl<DistributionMoni
distributionMonitor.setMonitorId(monitor.getId());
distributionMonitor.setCreatedDate(LocalDateTime.now());
distributionMonitor.setIfPowerUser(0);
distributionMonitor.setMonitorState(distributionMonitorParam.getMonitorState());
distributionMonitor.setMonitorState(monitor.getMonitorState());
distributionMonitor.setVoltageLevel(monitor.getVoltageLevel());
distributionMonitor.setStatus(DataStateEnum.ENABLE.getCode());
distributionMonitor.setTerminalId(monitor.getTerminalId());

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneralDeviceServiceImpl.java
View File

@@ -123,7 +123,7 @@ public class PmsGeneralDeviceServiceImpl implements IPmsGeneralDeviceService {
List<PmsMonitorBaseDTO> monitorList = monitorService.getMonitorByCondition(deptIdList,pmsDeviceInfoParam);
pmsGeneralDeviceDTO.setPowerrIdList(monitorList.stream().map(PmsMonitorBaseDTO::getPowerrId).distinct().collect(Collectors.toList()));
pmsGeneralDeviceDTO.setTerminalIdList(monitorList.stream().map(PmsMonitorBaseDTO::getTerminalId).distinct().collect(Collectors.toList()));
pmsGeneralDeviceDTO.setGeneratrixIdList(monitorList.stream().map(PmsMonitorBaseDTO::getGeneratrixId).distinct().collect(Collectors.toList()));
pmsGeneralDeviceDTO.setGeneratrixIdList(monitorList.stream().map(PmsMonitorBaseDTO::getLineId).distinct().collect(Collectors.toList()));
pmsGeneralDeviceDTO.setMonitorIdList(monitorList.stream().map(PmsMonitorBaseDTO::getMonitorId).distinct().collect(Collectors.toList()));
return pmsGeneralDeviceDTO;
}

1
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalEliminateDataServiceImpl.java
View File

@@ -64,6 +64,7 @@ public class TerminalEliminateDataServiceImpl extends ServiceImpl<TerminalElimin
//主网
LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(Monitor::getOrgId,deptIds)
.like(StrUtil.isNotBlank(taiZhangParam.getSearchValue()),Monitor::getName,taiZhangParam.getSearchValue())
.eq(StrUtil.isNotBlank(taiZhangParam.getMonitorState()),Monitor::getMonitorState,taiZhangParam.getMonitorState())
.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()).orderByDesc(Monitor::getCreateTime);
monitorPage = monitorMapper.selectPage(new Page<>(PageFactory.getPageNum(taiZhangParam),PageFactory.getPageSize(taiZhangParam)),lambdaQueryWrapper);

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java
View File

@@ -323,7 +323,7 @@ public class RStatOrgYServiceImpl extends ServiceImpl<RStatOrgYMapper, RStatOrgY
if (CollUtil.isNotEmpty(pmsMonitorDTOS)) {
//获取最新过滤的变电站id
List<String> ids = pmsMonitorDTOS.stream().map(PmsMonitorDTO::getPowerrId).collect(Collectors.toList());
List<String> ids = pmsMonitorDTOS.stream().map(PmsMonitorDTO::getPowerrId).distinct().collect(Collectors.toList());
//根据id进行筛选
StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class);
baseParam.setIds(ids);