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

1.增加国网上送标识

Browse Source 
2.修改国网上送定时任务
This commit is contained in:
wr
2024-03-13 15:05:52 +08:00
parent 4ed31bd4b1
commit 1192b87083
3 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,5 +33,9 @@ public class TerminalQueryParam extends BaseParam {
@ApiModelProperty(value = "是否上送国网监测点") @ApiModelProperty(value = "是否上送国网监测点")
private Integer isUpToGrid; private Integer isUpToGrid;
@ApiModelProperty(value = "典型上送标识")
private Integer isUploadHead;
@ApiModelProperty(value = "主网上送标识")
private Integer monitorUploadStatus;
} }

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

@@ -222,6 +222,8 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
.eq(StrUtil.isNotBlank(baseParam.getMonitorState()), Monitor::getMonitorState, baseParam.getMonitorState()) .eq(StrUtil.isNotBlank(baseParam.getMonitorState()), Monitor::getMonitorState, baseParam.getMonitorState())
.eq(StrUtil.isNotBlank(baseParam.getMonitorTag()), Monitor::getMonitorTag, baseParam.getMonitorTag()) .eq(StrUtil.isNotBlank(baseParam.getMonitorTag()), Monitor::getMonitorTag, baseParam.getMonitorTag())
.eq(Objects.nonNull(baseParam.getIsUpToGrid()), Monitor::getIsUpToGrid, baseParam.getIsUpToGrid()) .eq(Objects.nonNull(baseParam.getIsUpToGrid()), Monitor::getIsUpToGrid, baseParam.getIsUpToGrid())
.eq(Objects.nonNull(baseParam.getIsUploadHead()), Monitor::getIsUploadHead, baseParam.getIsUploadHead())
.eq(Objects.nonNull(baseParam.getMonitorUploadStatus()), Monitor::getMonitorUploadStatus, baseParam.getMonitorUploadStatus())
.and(StrUtil.isNotBlank(baseParam.getSearchValue()), i -> i.like(Monitor::getName, baseParam.getSearchValue()) .and(StrUtil.isNotBlank(baseParam.getSearchValue()), i -> i.like(Monitor::getName, baseParam.getSearchValue())
.or() .or()

14
pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/MonitorSendOtherUserTaskRunner.java
View File

@@ -20,28 +20,16 @@ import java.util.List;
public class MonitorSendOtherUserTaskRunner implements TimerTaskRunner { public class MonitorSendOtherUserTaskRunner implements TimerTaskRunner {
private final MonitorSendClient monitorSendClient; private final MonitorSendClient monitorSendClient;
private final SysDicTreePOService sysDicTreePOService;
@Override @Override
public void action(String date) { public void action(String date) {
List<DictTreeVO> dictTreeVOS = sysDicTreePOService.queryByPid("0");
for (DictTreeVO dictTreeVO : dictTreeVOS) {
if(dictTreeVO.getCode().equals("1401")||
dictTreeVO.getCode().equals("1402")||
dictTreeVO.getCode().equals("2400")||
dictTreeVO.getCode().equals("1300")||
dictTreeVO.getCode().equals("Device_Unit")){
continue;
}
//干扰用户 //干扰用户
MonitorParam.Info param = new MonitorParam.Info(); MonitorParam.Info param = new MonitorParam.Info();
param.setObjType(dictTreeVO.getId()); param.setObjType("987654321");
param.setFiy(true); param.setFiy(true);
String code = monitorSendClient.windSend(param).getCode(); String code = monitorSendClient.windSend(param).getCode();
if(code.equals("A0002")){ if(code.equals("A0002")){
throw new BusinessException("失败"); throw new BusinessException("失败");
} }
} }
}
} }