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
2024-05-09 16:02:31 +08:00
parent 1b85acaa74
commit 6f3329af21
14 changed files with 703 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RDimBusUpDMapper.java Normal file
View File

@@ -0,0 +1,17 @@
package com.njcn.prepare.harmonic.mapper.mysql.upload;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.prepare.harmonic.pojo.po.RDimBusUpD;
/**
* <p>
* 母线越限详情 Mapper 接口
* </p>
*
* @author cdf
* @since 2024-05-09
*/
public interface RDimBusUpDMapper extends BaseMapper<RDimBusUpD> {
}

17
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RDimBusUpMMapper.java Normal file
View File

@@ -0,0 +1,17 @@
package com.njcn.prepare.harmonic.mapper.mysql.upload;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.prepare.harmonic.pojo.po.RDimBusUpM;
/**
* <p>
* 母线越限详情 Mapper 接口
* </p>
*
* @author cdf
* @since 2024-05-09
*/
public interface RDimBusUpMMapper extends BaseMapper<RDimBusUpM> {
}

17
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RDimBusUpYMapper.java Normal file
View File

@@ -0,0 +1,17 @@
package com.njcn.prepare.harmonic.mapper.mysql.upload;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.prepare.harmonic.pojo.po.RDimBusUpY;
/**
* <p>
* 母线越限详情 Mapper 接口
* </p>
*
* @author cdf
* @since 2024-05-09
*/
public interface RDimBusUpYMapper extends BaseMapper<RDimBusUpY> {
}

17
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRDimBusUpDService.java Normal file
View File

@@ -0,0 +1,17 @@
package com.njcn.prepare.harmonic.service.mysql.upload;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.prepare.harmonic.pojo.po.RDimBusUpD;
/**
* <p>
* 母线越限详情 服务类
* </p>
*
* @author cdf
* @since 2024-05-09
*/
public interface IRDimBusUpDService extends IService<RDimBusUpD> {
}

17
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRDimBusUpMService.java Normal file
View File

@@ -0,0 +1,17 @@
package com.njcn.prepare.harmonic.service.mysql.upload;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.prepare.harmonic.pojo.po.RDimBusUpM;
/**
* <p>
* 母线越限详情 服务类
* </p>
*
* @author cdf
* @since 2024-05-09
*/
public interface IRDimBusUpMService extends IService<RDimBusUpM> {
}

17
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRDimBusUpYService.java Normal file
View File

@@ -0,0 +1,17 @@
package com.njcn.prepare.harmonic.service.mysql.upload;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.prepare.harmonic.pojo.po.RDimBusUpY;
/**
* <p>
* 母线越限详情 服务类
* </p>
*
* @author cdf
* @since 2024-05-09
*/
public interface IRDimBusUpYService extends IService<RDimBusUpY> {
}

8
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticMServiceImpl.java
View File

@@ -61,6 +61,8 @@ public class PmsRunStatisticMServiceImpl extends MppServiceImpl<PmsRunStatisticM
Set<String> busRunSet = new HashSet<>();
Set<String> stationSet = new HashSet<>();
Set<String> devRunSet = new HashSet<>();
Set<String> typicalSet = new HashSet<>();
val.forEach(item->{
if(StrUtil.isNotBlank(item.getRunMonitorIds())){
@@ -83,12 +85,16 @@ public class PmsRunStatisticMServiceImpl extends MppServiceImpl<PmsRunStatisticM
if(StrUtil.isNotBlank(item.getRunBusIds())){
busRunSet.addAll(Arrays.asList(item.getRunBusIds().split(StrUtil.COMMA)));
}
if(StrUtil.isNotBlank(item.getRunDevIds())){
devRunSet.addAll(Arrays.asList(item.getRunDevIds().split(StrUtil.COMMA)));
}
});
pmsRunStatisticM.setRunMonitorIds(String.join(StrUtil.COMMA,pointSet));
pmsRunStatisticM.setOnlineMonitorIds(String.join(StrUtil.COMMA,pointOnlineSet));
pmsRunStatisticM.setOnlineBusIds(String.join(StrUtil.COMMA,busSet));
pmsRunStatisticM.setOnlineStationIds(String.join(StrUtil.COMMA,stationSet));
pmsRunStatisticM.setRunDevIds(String.join(StrUtil.COMMA,devRunSet));
pmsRunStatisticM.setTypicalOnlineIds(String.join(StrUtil.COMMA,typicalSet));
//月在运母线，电站数量取日的最大值

23
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticYServiceImpl.java
View File

@@ -6,8 +6,10 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.prepare.harmonic.mapper.mysql.upload.PmsRunStatisticDMapper;
import com.njcn.prepare.harmonic.mapper.mysql.upload.PmsRunStatisticMMapper;
import com.njcn.prepare.harmonic.mapper.mysql.upload.PmsRunStatisticYMapper;
import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticD;
import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticM;
import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticY;
import com.njcn.prepare.harmonic.service.mysql.upload.IPmsRunStatisticYService;
@@ -31,7 +33,7 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
public class PmsRunStatisticYServiceImpl extends MppServiceImpl<PmsRunStatisticYMapper, PmsRunStatisticY> implements IPmsRunStatisticYService {
private final PmsRunStatisticMMapper pmsRunStatisticMMapper;
private final PmsRunStatisticDMapper pmsRunStatisticDMapper;
@@ -46,10 +48,10 @@ public class PmsRunStatisticYServiceImpl extends MppServiceImpl<PmsRunStatisticY
ZoneId zoneId = ZoneId.systemDefault();
LocalDate localDate = begin.toInstant().atZone(zoneId).toLocalDate();
LambdaQueryWrapper<PmsRunStatisticM> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.between(PmsRunStatisticM::getStatisticDate,begin,end);
List<PmsRunStatisticM> pmsRunStatisticDList = pmsRunStatisticMMapper.selectList(lambdaQueryWrapper);
Map<String,List<PmsRunStatisticM>> map = pmsRunStatisticDList.stream().collect(Collectors.groupingBy(PmsRunStatisticM::getDeptId));
LambdaQueryWrapper<PmsRunStatisticD> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.between(PmsRunStatisticD::getStatisticDate,begin,end);
List<PmsRunStatisticD> pmsRunStatisticDList = pmsRunStatisticDMapper.selectList(lambdaQueryWrapper);
Map<String,List<PmsRunStatisticD>> map = pmsRunStatisticDList.stream().collect(Collectors.groupingBy(PmsRunStatisticD::getDeptId));
map.forEach((key,val)->{
PmsRunStatisticY pmsRunStatisticY = new PmsRunStatisticY();
@@ -63,6 +65,8 @@ public class PmsRunStatisticYServiceImpl extends MppServiceImpl<PmsRunStatisticY
Set<String> busRunSet = new HashSet<>();
Set<String> stationSet = new HashSet<>();
Set<String> devRunSet = new HashSet<>();
Set<String> typicalSet = new HashSet<>();
val.forEach(item->{
if(StrUtil.isNotBlank(item.getRunMonitorIds())){
@@ -85,18 +89,21 @@ public class PmsRunStatisticYServiceImpl extends MppServiceImpl<PmsRunStatisticY
if(StrUtil.isNotBlank(item.getRunBusIds())){
busRunSet.addAll(Arrays.asList(item.getRunBusIds().split(StrUtil.COMMA)));
}
if(StrUtil.isNotBlank(item.getRunDevIds())){
devRunSet.addAll(Arrays.asList(item.getRunDevIds().split(StrUtil.COMMA)));
}
});
pmsRunStatisticY.setRunMonitorIds(String.join(StrUtil.COMMA,pointSet));
pmsRunStatisticY.setOnlineMonitorIds(String.join(StrUtil.COMMA,pointOnlineSet));
pmsRunStatisticY.setOnlineBusIds(String.join(StrUtil.COMMA,busSet));
pmsRunStatisticY.setOnlineStationIds(String.join(StrUtil.COMMA,stationSet));
pmsRunStatisticY.setRunDevIds(String.join(StrUtil.COMMA,devRunSet));
pmsRunStatisticY.setTypicalOnlineIds(String.join(StrUtil.COMMA,typicalSet));
//月在运母线，电站数量取日的最大值
int temBus = val.stream().map(PmsRunStatisticM::getRunBusNum).filter(Objects::nonNull).max(Integer::compareTo).orElse(0);
int temStation = val.stream().map(PmsRunStatisticM::getRunStationNum).filter(Objects::nonNull).max(Integer::compareTo).orElse(0);
pmsRunStatisticY.setRunBusNum(temBus);
int temStation = val.stream().map(PmsRunStatisticD::getRunStationNum).filter(Objects::nonNull).max(Integer::compareTo).orElse(0);
pmsRunStatisticY.setRunBusNum(devRunSet.size());
pmsRunStatisticY.setRunBusIds(String.join(StrUtil.COMMA,busRunSet));
pmsRunStatisticY.setRunStationNum(temStation);

23
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpDServiceImpl.java Normal file
View File

@@ -0,0 +1,23 @@
package com.njcn.prepare.harmonic.service.mysql.upload.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.prepare.harmonic.mapper.mysql.upload.RDimBusUpDMapper;
import com.njcn.prepare.harmonic.pojo.po.RDimBusUpD;
import com.njcn.prepare.harmonic.service.mysql.upload.IRDimBusUpDService;
import org.springframework.stereotype.Service;
/**
* <p>
* 母线越限详情 服务实现类
* </p>
*
* @author cdf
* @since 2024-05-09
*/
@Service
public class RDimBusUpDServiceImpl extends ServiceImpl<RDimBusUpDMapper, RDimBusUpD> implements IRDimBusUpDService {
// void handBusDay();
}

21
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpMServiceImpl.java Normal file
View File

@@ -0,0 +1,21 @@
package com.njcn.prepare.harmonic.service.mysql.upload.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.prepare.harmonic.mapper.mysql.upload.RDimBusUpMMapper;
import com.njcn.prepare.harmonic.pojo.po.RDimBusUpM;
import com.njcn.prepare.harmonic.service.mysql.upload.IRDimBusUpMService;
import org.springframework.stereotype.Service;
/**
* <p>
* 母线越限详情 服务实现类
* </p>
*
* @author cdf
* @since 2024-05-09
*/
@Service
public class RDimBusUpMServiceImpl extends ServiceImpl<RDimBusUpMMapper, RDimBusUpM> implements IRDimBusUpMService {
}

21
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpYServiceImpl.java Normal file
View File

@@ -0,0 +1,21 @@
package com.njcn.prepare.harmonic.service.mysql.upload.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.prepare.harmonic.mapper.mysql.upload.RDimBusUpYMapper;
import com.njcn.prepare.harmonic.pojo.po.RDimBusUpY;
import com.njcn.prepare.harmonic.service.mysql.upload.IRDimBusUpYService;
import org.springframework.stereotype.Service;
/**
* <p>
* 母线越限详情 服务实现类
* </p>
*
* @author cdf
* @since 2024-05-09
*/
@Service
public class RDimBusUpYServiceImpl extends ServiceImpl<RDimBusUpYMapper, RDimBusUpY> implements IRDimBusUpYService {
}