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:
cdf
2025-03-10 09:15:29 +08:00
parent 14707fe3e9
commit 228a8558ac
10 changed files with 174 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,8 @@ public class TerminalQueryParam extends BaseParam {
@ApiModelProperty(value = "监测对象类型")
private String objType;
private List<String> objTypeList;
@ApiModelProperty(value = "是否上送国网监测点")
private Integer isUpToGrid;

9
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/gwPush/MonitorStatisticsController.java
View File

@@ -35,6 +35,15 @@ public class MonitorStatisticsController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, gwMonitorStatistics, methodDescribe);
}
@PostMapping("/objTypeStatis")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("查询主网用户分类")
public HttpResult< List<List<String>>> objTypeStatis(String deptId){
String methodDescribe = getMethodDescribe("objTypeStatis");
List<List<String>> gwMonitorStatistics = monitorStatisticsService.objTypeStatistic(deptId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, gwMonitorStatistics, methodDescribe);
}
@PostMapping("/energy")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("新能源场站监测率")

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

@@ -121,6 +121,22 @@ public class PmsMonitorController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
}
/**
* 分页获取所有主网用户台账
* @author cdf
* @date 2022/11/25
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getAllMainUserPageList")
@ApiOperation("分页获取所有主网用户台账")
@ApiImplicitParam(name = "baseParam",required = true)
public HttpResult<Page<Monitor>> getAllMainUserPageList(@RequestBody TerminalQueryParam baseParam) {
String methodDescribe = getMethodDescribe("getAllMainUserPageList");
Page<Monitor> monitor= monitorService.getAllMainUserPageList(baseParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
}
/**
* 获取所有主网监测点
* @author cdf

15
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/MonitorMapper.java
View File

@@ -1,16 +1,14 @@
package com.njcn.device.pms.mapper.majornetwork;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.dto.SimpleDTO;
import com.njcn.common.pojo.param.StatisticsBizBaseParam;
import com.njcn.device.biz.pojo.dto.LineDTO;
import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
import com.njcn.device.pms.pojo.param.PmsMonitorParam;
import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
import com.njcn.device.pms.pojo.param.*;
import com.njcn.device.pms.pojo.po.Monitor;
import com.njcn.device.pms.pojo.vo.MonitorVO;
import org.apache.ibatis.annotations.Param;
@@ -108,4 +106,13 @@ public interface MonitorMapper extends BaseMapper<Monitor> {
List<Monitor> selectMonitorAndNewEnergy(@Param("orgIds")List<String> orgIds,
@Param("objIds")List<String> objIds);
/**
* 分页获取用户对象
*/
Page<Monitor> getAllObjUser(@Param("page") Page<Monitor> page, @Param("baseParam")TerminalQueryParam baseParam);
List<Monitor> getAllObjUser(@Param("baseParam")TerminalQueryParam baseParam);
}

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

@@ -259,4 +259,42 @@
</where>
</select>
<select id="getAllObjUser" resultType="com.njcn.device.pms.pojo.po.Monitor">
SELECT
monitor.Id,
monitor.NAME,
monitor.Org_Id,
monitor.Org_Name,
monitor.Operation_Name,
monitor.Powerr_Name,
monitor.Line_Name,
monitor.Voltage_Level,
monitor.Monitor_Tag,
monitor.Obj_Type,
monitor.Monitor_Object_Name,
monitor.trade_Code,
monitor.Is_Special_Supply_Electricity
FROM
pms_monitor monitor
INNER JOIN
(
SELECT max( id ) id, Monitor_Object_Name
FROM pms_monitor
where Monitor_Object_Name is not null
and Status = 1
<if test="baseParam.monitorTag!=null and baseParam.monitorTag!=''">
and monitor.Monitor_Tag = #{baseParam.monitorTag}
</if>
<if test="baseParam.objTypeList !=null and baseParam.objTypeList.size() != 0">
and monitor.Obj_Type in
<foreach collection="baseParam.objTypeList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
GROUP BY Monitor_Object_Name
) t ON monitor.id = t.id
</select>
</mapper>

8
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/MonitorStatisticsService.java
View File

@@ -21,6 +21,14 @@ public interface MonitorStatisticsService {
*/
List<List<String>> getGwMonitorStatistics(String deptId,Integer up);
/**
* @Description: 国网上送统计类型数量统计
* @Author: wr
* @Date: 2024/3/22 9:49
*/
List<List<String>> objTypeStatistic(String deptId);
/**
* @Description: 国网上送新能源场站统计
* @Author: wr

49
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorStatisticsServiceImpl.java
View File

@@ -15,6 +15,7 @@ import com.njcn.device.pms.mapper.majornetwork.MonitorMapper;
import com.njcn.device.pms.mapper.majornetwork.PmsGeneratrixWireMapper;
import com.njcn.device.pms.mapper.majornetwork.RStatIntegrityDMapper;
import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper;
import com.njcn.device.pms.pojo.param.TerminalQueryParam;
import com.njcn.device.pms.pojo.param.gw.GwStatisticalParam;
import com.njcn.device.pms.pojo.param.gw.GwTerminalParam;
import com.njcn.device.pms.pojo.po.*;
@@ -129,6 +130,54 @@ public class MonitorStatisticsServiceImpl implements MonitorStatisticsService {
return info;
}
@Override
public List<List<String>> objTypeStatistic(String deptId) {
List<List<String>> info = new ArrayList<>();
//查询所有一级树字典
List<SysDicTreePO> sysDicTreePOList = dictTreeFeignClient.queryAll().getData();
//监测点大类
List<SysDicTreePO> broadCategory = sysDicTreePOList.stream()
.filter(item -> Objects.equals(item.getPid(), "0"))
.filter(item -> !Objects.equals(item.getCode(), DicDataTypeEnum.DEVICE_UNIT.getCode()))
.collect(Collectors.toList());
broadCategory.sort(Comparator.comparing(SysDicTreePO::getSort));
List<String> list = new ArrayList<>();
list.add("单位");
List<String> collect = broadCategory.stream().map(SysDicTreePO::getName).collect(Collectors.toList());
list.addAll(collect);
list.add("合计");
//获取主网监测统计
Map<String, List<String>> metWorkMap = mapDicIds(broadCategory, sysDicTreePOList);
info.add(list);
TerminalQueryParam baseParam = new TerminalQueryParam();
List<Monitor> monitorList = monitorMapper.getAllObjUser(baseParam);
//筛选出国网统计信息
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
deptGetLineParam.setDeptId(deptId);
deptGetLineParam.setMonitorStateRunning(false);
deptGetLineParam.setSystemType(0);
List<DeptGetBase> deptGetChildrenMoreDTOS = commTerminalService.getDeptChildrenByParent(deptGetLineParam);
//部门信息循环
for (DeptGetBase dept : deptGetChildrenMoreDTOS) {
List<String> line = new ArrayList<>();
line.add(dept.getUnitName());
List<String> deptIds = dept.getUnitChildrenList();
if (CollUtil.isEmpty(deptIds)) {
continue;
}
List<Monitor> temList = monitorList.stream().filter(it->deptIds.contains(it.getOrgId())).collect(Collectors.toList());
metWorkMap.forEach((k,v)->{
long count = temList.stream().filter(i->v.contains(i.getObjType())).count();
line.add(String.valueOf(count));
});
info.add(line);
}
return info;
}
@Override
public List<MonitorEnergy> getGwMonitorEnergy(String deptId) {
List<DictData> data = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();

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

@@ -87,6 +87,9 @@ public interface IMonitorService extends IService<Monitor> {
Page<Monitor> getAllMonitorPageList(TerminalQueryParam baseParam);
Page<Monitor> getAllMainUserPageList(TerminalQueryParam baseParam);
List<Monitor> getMonitorList(List<String> monitorIds);
List<Monitor> getMonitorListByMid(List<String> midIds);

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

@@ -287,6 +287,42 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
return page;
}
@Override
public Page<Monitor> getAllMainUserPageList(TerminalQueryParam baseParam) {
List<String> objTypeIds = new ArrayList<>();
if(StrUtil.isNotBlank(baseParam.getObjType())){
if(baseParam.getObjType().equals("987654321")){
//特殊处理
List<SysDicTreePO> sysDicTreePOList = dictTreeFeignClient.queryAll().getData();
List<SysDicTreePO> typicDic =sysDicTreePOList.stream().filter(item->Objects.equals(DicTreeEnum.Power_Station.getCode(),item.getCode())||Objects.equals(DicTreeEnum.Ele_Railways.getCode(),item.getCode())||
Objects.equals(DicTreeEnum.Wind_Farms.getCode(),item.getCode())||Objects.equals(DicTreeEnum.Imp_Users.getCode(),item.getCode())).collect(Collectors.toList());
for(SysDicTreePO sysDicTreePO : typicDic){
List<DictTreeVO> temList = dictTreeFeignClient.query(sysDicTreePO.getId()).getData();
List<String> ids = temList.stream().map(DictTreeVO::getId).collect(Collectors.toList());
objTypeIds.addAll(ids);
objTypeIds.add(sysDicTreePO.getId());
}
}else {
SysDicTreePO sysDicTreePO = dictTreeFeignClient.queryById(baseParam.getObjType()).getData();
if(sysDicTreePO.getPid().equals("0")){
List<DictTreeVO> temList = dictTreeFeignClient.query(sysDicTreePO.getId()).getData();
List<String> ids = temList.stream().map(DictTreeVO::getId).collect(Collectors.toList());
objTypeIds.addAll(ids);
}
objTypeIds.add(sysDicTreePO.getId());
}
baseParam.setObjTypeList(objTypeIds);
}
Page<Monitor> page = this.baseMapper.getAllObjUser(new Page<>(baseParam.getPageNum(), baseParam.getPageSize()),baseParam);
return page;
}
@Override
public List<Monitor> getMonitorList(List<String> monitorIds) {
List<Monitor> monitorList = new ArrayList<>();

5
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpWpPowerDetailMServiceImpl.java
View File

@@ -56,13 +56,12 @@ public class RMpWpPowerDetailMServiceImpl extends ServiceImpl<RMpWpPowerDetailMM
@Override
public Page<RMpWpPowerDetailVO> getWindFarmDetailInfo(PowerQualityParam.PowerQualityInfoParam param) {
//获取部门id集合
List<DeptDTO> deptDTOS = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData();
List<String> deptIds = deptDTOS.stream().map(DeptDTO::getCode).collect(Collectors.toList());
List<String> codeIds = deptFeignClient.getDepSonSelfCodetByDeptId(param.getId()).getData();
//根据条件查询单位下面的所有配网监测点
PmsMonitorParam pmsMonitorParam = new PmsMonitorParam();
//单位id
pmsMonitorParam.setOrgIds(deptIds);
pmsMonitorParam.setOrgIds(codeIds);
pmsMonitorParam.setMonitorTag(param.getMonitorTag());
pmsMonitorParam.setIsSpecialMonitor(1);