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

1.监测点告警统计代码调整

Browse Source
This commit is contained in:
wr
2024-03-15 15:19:57 +08:00
parent 6226658dc3
commit 5b7763b265
4 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RMpMonitorAlarmCountMController.java
View File

@@ -1,5 +1,6 @@
package com.njcn.device.pms.controller.majornetwork;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
@@ -17,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 监测点告警统计
@@ -45,9 +45,9 @@ public class RMpMonitorAlarmCountMController extends BaseController {
@PostMapping("/getRMpMonitorAlarmCountMList")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("查询监测点告警统计(月)(主网)")
public HttpResult<List<RMpMonitorAlarmCountMVO>> getAllRStatAreaAlarmCountMList(@RequestBody RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam) {
public HttpResult<Page<RMpMonitorAlarmCountMVO>> getAllRStatAreaAlarmCountMList(@RequestBody RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam) {
String methodDescribe = getMethodDescribe("getAllRStatAreaAlarmCountMList");
List<RMpMonitorAlarmCountMVO> list = rMpMonitorAlarmCountMService.getRMpMonitorAlarmCountMList(rMpMonitorAlarmCountMParam);
Page<RMpMonitorAlarmCountMVO> list = rMpMonitorAlarmCountMService.getRMpMonitorAlarmCountMList(rMpMonitorAlarmCountMParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
}

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

@@ -28,7 +28,7 @@
</foreach>
</if>
<if test="param.deviceName != null and param.deviceName !=''">
and pms_terminal.id like concat('%',#{param.deviceName},'%')
and pms_terminal.NAME like concat('%',#{param.deviceName},'%')
</if>
<if test="param.deviceStatus != null and param.deviceStatus !='' ">
and pms_terminal.Terminal_State = #{param.deviceStatus}

4
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RMpMonitorAlarmCountMService.java
View File

@@ -1,11 +1,11 @@
package com.njcn.device.pms.service.majornetwork;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.device.pms.pojo.param.RMpMonitorAlarmCountMParam;
import com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM;
import com.njcn.device.pms.pojo.vo.RMpMonitorAlarmCountMVO;
import java.util.List;
/**
* @author jianghf
@@ -22,6 +22,6 @@ public interface RMpMonitorAlarmCountMService extends IService<RMpMonitorAlarmCo
* @param rMpMonitorAlarmCountMParam
* @return com.njcn.common.pojo.response.HttpResult<java.util.List<com.njcn.device.pms.pojo.vo.RMpMonitorAlarmCountMVO>>
*/
List<RMpMonitorAlarmCountMVO> getRMpMonitorAlarmCountMList(RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam);
Page<RMpMonitorAlarmCountMVO> getRMpMonitorAlarmCountMList(RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam);
}

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

@@ -1,7 +1,9 @@
package com.njcn.device.pms.service.majornetwork.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
@@ -10,19 +12,15 @@ import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
import com.njcn.device.biz.pojo.param.DeptGetLineParam;
import com.njcn.device.pms.mapper.majornetwork.RMpMonitorAlarmCountMMapper;
import com.njcn.device.pms.pojo.param.RMpMonitorAlarmCountMParam;
import com.njcn.device.pms.pojo.po.Monitor;
import com.njcn.device.pms.pojo.po.RMpMonitorAlarmCountM;
import com.njcn.device.pms.pojo.vo.RMpMonitorAlarmCountMVO;
import com.njcn.device.pms.service.ledgerManger.CommTerminalService;
import com.njcn.device.pms.service.majornetwork.IMonitorService;
import com.njcn.device.pms.service.majornetwork.RMpMonitorAlarmCountMService;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.pojo.po.DictData;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.dto.DeptDTO;
import com.njcn.web.utils.WebUtil;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -58,7 +56,8 @@ implements RMpMonitorAlarmCountMService {
* @return java.util.List<com.njcn.device.pms.pojo.vo.RMpMonitorAlarmCountMVO>
*/
@Override
public List<RMpMonitorAlarmCountMVO> getRMpMonitorAlarmCountMList(RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam) {
public Page<RMpMonitorAlarmCountMVO> getRMpMonitorAlarmCountMList(RMpMonitorAlarmCountMParam rMpMonitorAlarmCountMParam) {
Page<RMpMonitorAlarmCountMVO> resultPage = new Page<>();
List<RMpMonitorAlarmCountMVO> resultList = new ArrayList<>();
//提取查询条件
String id = rMpMonitorAlarmCountMParam.getId(); //单位id
@@ -69,12 +68,12 @@ implements RMpMonitorAlarmCountMService {
String endTime = rMpMonitorAlarmCountMParam.getEndTime(); //结束时间
//监测对象类型
if (StringUtils.isBlank(rMpMonitorAlarmCountMParam.getMonitorObjectType())){
return resultList;
return resultPage;
}
List<String> monitorObjectType = StringUtils.isNotBlank(rMpMonitorAlarmCountMParam.getMonitorObjectType()) ? Arrays.asList(rMpMonitorAlarmCountMParam.getMonitorObjectType().split(",")) : null;
//电压等级
if (StringUtils.isBlank(rMpMonitorAlarmCountMParam.getVoltageLevel())){
return resultList;
return resultPage;
}
List<String> voltageLevelParamList = StringUtils.isNotBlank(rMpMonitorAlarmCountMParam.getVoltageLevel()) ? Arrays.asList(rMpMonitorAlarmCountMParam.getVoltageLevel().split(",")) : null; //电压等级
String monitorName = rMpMonitorAlarmCountMParam.getMeasurementPointName(); //监测点名称
@@ -112,13 +111,13 @@ implements RMpMonitorAlarmCountMService {
lambdaQueryWrapper.in(RMpMonitorAlarmCountM::getMeasurementPointId, lineList)
.ge(RMpMonitorAlarmCountM::getDataDate, startTime)
.le(RMpMonitorAlarmCountM::getDataDate, endTime);
List<RMpMonitorAlarmCountM> alarmCountMList = this.list(lambdaQueryWrapper);
Map<String,List<RMpMonitorAlarmCountM>> map = alarmCountMList.stream().collect(Collectors.groupingBy(RMpMonitorAlarmCountM::getMeasurementPointId));
Page<RMpMonitorAlarmCountM> page = this.page(new Page<>(rMpMonitorAlarmCountMParam.getPageNum(), rMpMonitorAlarmCountMParam.getPageSize()), lambdaQueryWrapper);
BeanUtil.copyProperties(page,resultPage);
Map<String,List<RMpMonitorAlarmCountM>> map = page.getRecords().stream().collect(Collectors.groupingBy(RMpMonitorAlarmCountM::getMeasurementPointId));
for (LineDevGetDTO item2 : lineDto) {
RMpMonitorAlarmCountMVO vo = new RMpMonitorAlarmCountMVO();
if (CollUtil.isNotEmpty(map.get(item2.getPointId()))){
if (map.containsKey(item2.getPointId())){
BeanUtils.copyProperties(map.get(item2.getPointId()).get(0), vo);
}
//所属单位名称
vo.setOrgName(item2.getUnitName());
vo.setOrgNo(item2.getUnitId());
@@ -137,10 +136,12 @@ implements RMpMonitorAlarmCountMService {
}
}
}
}
if (CollUtil.isNotEmpty(resultList)){
resultList = resultList.stream().sorted(Comparator.comparing(RMpMonitorAlarmCountMVO::getOrgName).reversed()).collect(Collectors.toList());
}
return resultList;
resultPage.setRecords(resultList);
return resultPage;
}
}