Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -0,0 +1,206 @@
|
||||
package com.njcn.prepare.harmonic.pojo.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.njcn.db.bo.BaseEntity;
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 母线越限详情
|
||||
* </p>
|
||||
*
|
||||
* @author cdf
|
||||
* @since 2024-05-09
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@TableName("r_dim_bus_up_d")
|
||||
public class RDimBusUpD extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private LocalDate statisticDate;
|
||||
|
||||
private String phasicType;
|
||||
|
||||
private String busId;
|
||||
|
||||
private String midBusId;
|
||||
|
||||
private String effectId;
|
||||
|
||||
private String effectIds;
|
||||
|
||||
private String vlotageLevel;
|
||||
|
||||
private Integer v;
|
||||
|
||||
private Integer allTime;
|
||||
|
||||
private Integer flickerAllTime;
|
||||
|
||||
private Integer freqDevOvertime;
|
||||
|
||||
private Integer voltageDevOvertime;
|
||||
|
||||
private Integer ubalanceOvertime;
|
||||
|
||||
private Integer flickerOvertime;
|
||||
|
||||
private Integer uaberranceOvertime;
|
||||
|
||||
private Integer iNegOvertime;
|
||||
|
||||
@TableField(value = "uharm_2_overtime")
|
||||
private Integer uharm2Overtime;
|
||||
|
||||
@TableField(value = "uharm_3_overtime")
|
||||
private Integer uharm3Overtime;
|
||||
|
||||
@TableField(value = "uharm_4_overtime")
|
||||
private Integer uharm4Overtime;
|
||||
|
||||
@TableField(value = "uharm_5_overtime")
|
||||
private Integer uharm5Overtime;
|
||||
|
||||
@TableField(value = "uharm_6_overtime")
|
||||
private Integer uharm6Overtime;
|
||||
|
||||
@TableField(value = "uharm_7_overtime")
|
||||
private Integer uharm7Overtime;
|
||||
|
||||
@TableField(value = "uharm_8_overtime")
|
||||
private Integer uharm8Overtime;
|
||||
|
||||
@TableField(value = "uharm_9_overtime")
|
||||
private Integer uharm9Overtime;
|
||||
|
||||
@TableField(value = "uharm_10_overtime")
|
||||
private Integer uharm10Overtime;
|
||||
|
||||
@TableField(value = "uharm_11_overtime")
|
||||
private Integer uharm11Overtime;
|
||||
|
||||
@TableField(value = "uharm_12_overtime")
|
||||
private Integer uharm12Overtime;
|
||||
|
||||
@TableField(value = "uharm_13_overtime")
|
||||
private Integer uharm13Overtime;
|
||||
|
||||
@TableField(value = "uharm_14_overtime")
|
||||
private Integer uharm14Overtime;
|
||||
|
||||
@TableField(value = "uharm_15_overtime")
|
||||
private Integer uharm15Overtime;
|
||||
|
||||
@TableField(value = "uharm_16_overtime")
|
||||
private Integer uharm16Overtime;
|
||||
|
||||
@TableField(value = "uharm_17_overtime")
|
||||
private Integer uharm17Overtime;
|
||||
|
||||
@TableField(value = "uharm_18_overtime")
|
||||
private Integer uharm18Overtime;
|
||||
|
||||
@TableField(value = "uharm_19_overtime")
|
||||
private Integer uharm19Overtime;
|
||||
|
||||
@TableField(value = "uharm_20_overtime")
|
||||
private Integer uharm20Overtime;
|
||||
|
||||
@TableField(value = "uharm_21_overtime")
|
||||
private Integer uharm21Overtime;
|
||||
|
||||
@TableField(value = "uharm_22_overtime")
|
||||
private Integer uharm22Overtime;
|
||||
|
||||
@TableField(value = "uharm_23_overtime")
|
||||
private Integer uharm23Overtime;
|
||||
|
||||
@TableField(value = "uharm_24_overtime")
|
||||
private Integer uharm24Overtime;
|
||||
|
||||
@TableField(value = "uharm_25_overtime")
|
||||
private Integer uharm25Overtime;
|
||||
|
||||
@TableField(value = "uharm_26_overtime")
|
||||
private Integer uharm26Overtime;
|
||||
|
||||
@TableField(value = "uharm_27_overtime")
|
||||
private Integer uharm27Overtime;
|
||||
|
||||
@TableField(value = "uharm_28_overtime")
|
||||
private Integer uharm28Overtime;
|
||||
|
||||
@TableField(value = "uharm_29_overtime")
|
||||
private Integer uharm29Overtime;
|
||||
|
||||
@TableField(value = "uharm_30_overtime")
|
||||
private Integer uharm30Overtime;
|
||||
|
||||
@TableField(value = "uharm_31_overtime")
|
||||
private Integer uharm31Overtime;
|
||||
|
||||
@TableField(value = "uharm_32_overtime")
|
||||
private Integer uharm32Overtime;
|
||||
|
||||
@TableField(value = "uharm_33_overtime")
|
||||
private Integer uharm33Overtime;
|
||||
|
||||
@TableField(value = "uharm_34_overtime")
|
||||
private Integer uharm34Overtime;
|
||||
|
||||
@TableField(value = "uharm_35_overtime")
|
||||
private Integer uharm35Overtime;
|
||||
|
||||
@TableField(value = "uharm_36_overtime")
|
||||
private Integer uharm36Overtime;
|
||||
|
||||
@TableField(value = "uharm_37_overtime")
|
||||
private Integer uharm37Overtime;
|
||||
|
||||
@TableField(value = "uharm_38_overtime")
|
||||
private Integer uharm38Overtime;
|
||||
|
||||
@TableField(value = "uharm_39_overtime")
|
||||
private Integer uharm39Overtime;
|
||||
|
||||
@TableField(value = "uharm_40_overtime")
|
||||
private Integer uharm40Overtime;
|
||||
|
||||
@TableField(value = "uharm_41_overtime")
|
||||
private Integer uharm41Overtime;
|
||||
|
||||
@TableField(value = "uharm_42_overtime")
|
||||
private Integer uharm42Overtime;
|
||||
|
||||
@TableField(value = "uharm_43_overtime")
|
||||
private Integer uharm43Overtime;
|
||||
|
||||
@TableField(value = "uharm_44_overtime")
|
||||
private Integer uharm44Overtime;
|
||||
|
||||
@TableField(value = "uharm_45_overtime")
|
||||
private Integer uharm45Overtime;
|
||||
|
||||
@TableField(value = "uharm_46_overtime")
|
||||
private Integer uharm46Overtime;
|
||||
|
||||
@TableField(value = "uharm_47_overtime")
|
||||
private Integer uharm47Overtime;
|
||||
|
||||
@TableField(value = "uharm_48_overtime")
|
||||
private Integer uharm48Overtime;
|
||||
|
||||
@TableField(value = "uharm_49_overtime")
|
||||
private Integer uharm49Overtime;
|
||||
|
||||
@TableField(value = "uharm_50_overtime")
|
||||
private Integer uharm50Overtime;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,154 @@
|
||||
package com.njcn.prepare.harmonic.pojo.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.njcn.db.bo.BaseEntity;
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 母线越限详情
|
||||
* </p>
|
||||
*
|
||||
* @author cdf
|
||||
* @since 2024-05-09
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@TableName("r_dim_bus_up_m")
|
||||
public class RDimBusUpM extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private LocalDate statisticDate;
|
||||
|
||||
private String phasicType;
|
||||
|
||||
private String busId;
|
||||
|
||||
private String effectId;
|
||||
|
||||
private String effectIds;
|
||||
|
||||
private String vlotageLevel;
|
||||
|
||||
private Integer v;
|
||||
|
||||
private Integer allTime;
|
||||
|
||||
private Integer flickerAllTime;
|
||||
|
||||
private Integer freqDevOvertime;
|
||||
|
||||
private Integer voltageDevOvertime;
|
||||
|
||||
private Integer ubalanceOvertime;
|
||||
|
||||
private Integer flickerOvertime;
|
||||
|
||||
private Integer uaberranceOvertime;
|
||||
|
||||
private Integer iNegOvertime;
|
||||
|
||||
private Integer uharm2Overtime;
|
||||
|
||||
private Integer uharm3Overtime;
|
||||
|
||||
private Integer uharm4Overtime;
|
||||
|
||||
private Integer uharm5Overtime;
|
||||
|
||||
private Integer uharm6Overtime;
|
||||
|
||||
private Integer uharm7Overtime;
|
||||
|
||||
private Integer uharm8Overtime;
|
||||
|
||||
private Integer uharm9Overtime;
|
||||
|
||||
private Integer uharm10Overtime;
|
||||
|
||||
private Integer uharm11Overtime;
|
||||
|
||||
private Integer uharm12Overtime;
|
||||
|
||||
private Integer uharm13Overtime;
|
||||
|
||||
private Integer uharm14Overtime;
|
||||
|
||||
private Integer uharm15Overtime;
|
||||
|
||||
private Integer uharm16Overtime;
|
||||
|
||||
private Integer uharm17Overtime;
|
||||
|
||||
private Integer uharm18Overtime;
|
||||
|
||||
private Integer uharm19Overtime;
|
||||
|
||||
private Integer uharm20Overtime;
|
||||
|
||||
private Integer uharm21Overtime;
|
||||
|
||||
private Integer uharm22Overtime;
|
||||
|
||||
private Integer uharm23Overtime;
|
||||
|
||||
private Integer uharm24Overtime;
|
||||
|
||||
private Integer uharm25Overtime;
|
||||
|
||||
private Integer uharm26Overtime;
|
||||
|
||||
private Integer uharm27Overtime;
|
||||
|
||||
private Integer uharm28Overtime;
|
||||
|
||||
private Integer uharm29Overtime;
|
||||
|
||||
private Integer uharm30Overtime;
|
||||
|
||||
private Integer uharm31Overtime;
|
||||
|
||||
private Integer uharm32Overtime;
|
||||
|
||||
private Integer uharm33Overtime;
|
||||
|
||||
private Integer uharm34Overtime;
|
||||
|
||||
private Integer uharm35Overtime;
|
||||
|
||||
private Integer uharm36Overtime;
|
||||
|
||||
private Integer uharm37Overtime;
|
||||
|
||||
private Integer uharm38Overtime;
|
||||
|
||||
private Integer uharm39Overtime;
|
||||
|
||||
private Integer uharm40Overtime;
|
||||
|
||||
private Integer uharm41Overtime;
|
||||
|
||||
private Integer uharm42Overtime;
|
||||
|
||||
private Integer uharm43Overtime;
|
||||
|
||||
private Integer uharm44Overtime;
|
||||
|
||||
private Integer uharm45Overtime;
|
||||
|
||||
private Integer uharm46Overtime;
|
||||
|
||||
private Integer uharm47Overtime;
|
||||
|
||||
private Integer uharm48Overtime;
|
||||
|
||||
private Integer uharm49Overtime;
|
||||
|
||||
private Integer uharm50Overtime;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,154 @@
|
||||
package com.njcn.prepare.harmonic.pojo.po;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.njcn.db.bo.BaseEntity;
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 母线越限详情
|
||||
* </p>
|
||||
*
|
||||
* @author cdf
|
||||
* @since 2024-05-09
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@TableName("r_dim_bus_up_y")
|
||||
public class RDimBusUpY extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private LocalDate statisticDate;
|
||||
|
||||
private String phasicType;
|
||||
|
||||
private String busId;
|
||||
|
||||
private String effectId;
|
||||
|
||||
private String effectIds;
|
||||
|
||||
private String vlotageLevel;
|
||||
|
||||
private Integer v;
|
||||
|
||||
private Integer allTime;
|
||||
|
||||
private Integer flickerAllTime;
|
||||
|
||||
private Integer freqDevOvertime;
|
||||
|
||||
private Integer voltageDevOvertime;
|
||||
|
||||
private Integer ubalanceOvertime;
|
||||
|
||||
private Integer flickerOvertime;
|
||||
|
||||
private Integer uaberranceOvertime;
|
||||
|
||||
private Integer iNegOvertime;
|
||||
|
||||
private Integer uharm2Overtime;
|
||||
|
||||
private Integer uharm3Overtime;
|
||||
|
||||
private Integer uharm4Overtime;
|
||||
|
||||
private Integer uharm5Overtime;
|
||||
|
||||
private Integer uharm6Overtime;
|
||||
|
||||
private Integer uharm7Overtime;
|
||||
|
||||
private Integer uharm8Overtime;
|
||||
|
||||
private Integer uharm9Overtime;
|
||||
|
||||
private Integer uharm10Overtime;
|
||||
|
||||
private Integer uharm11Overtime;
|
||||
|
||||
private Integer uharm12Overtime;
|
||||
|
||||
private Integer uharm13Overtime;
|
||||
|
||||
private Integer uharm14Overtime;
|
||||
|
||||
private Integer uharm15Overtime;
|
||||
|
||||
private Integer uharm16Overtime;
|
||||
|
||||
private Integer uharm17Overtime;
|
||||
|
||||
private Integer uharm18Overtime;
|
||||
|
||||
private Integer uharm19Overtime;
|
||||
|
||||
private Integer uharm20Overtime;
|
||||
|
||||
private Integer uharm21Overtime;
|
||||
|
||||
private Integer uharm22Overtime;
|
||||
|
||||
private Integer uharm23Overtime;
|
||||
|
||||
private Integer uharm24Overtime;
|
||||
|
||||
private Integer uharm25Overtime;
|
||||
|
||||
private Integer uharm26Overtime;
|
||||
|
||||
private Integer uharm27Overtime;
|
||||
|
||||
private Integer uharm28Overtime;
|
||||
|
||||
private Integer uharm29Overtime;
|
||||
|
||||
private Integer uharm30Overtime;
|
||||
|
||||
private Integer uharm31Overtime;
|
||||
|
||||
private Integer uharm32Overtime;
|
||||
|
||||
private Integer uharm33Overtime;
|
||||
|
||||
private Integer uharm34Overtime;
|
||||
|
||||
private Integer uharm35Overtime;
|
||||
|
||||
private Integer uharm36Overtime;
|
||||
|
||||
private Integer uharm37Overtime;
|
||||
|
||||
private Integer uharm38Overtime;
|
||||
|
||||
private Integer uharm39Overtime;
|
||||
|
||||
private Integer uharm40Overtime;
|
||||
|
||||
private Integer uharm41Overtime;
|
||||
|
||||
private Integer uharm42Overtime;
|
||||
|
||||
private Integer uharm43Overtime;
|
||||
|
||||
private Integer uharm44Overtime;
|
||||
|
||||
private Integer uharm45Overtime;
|
||||
|
||||
private Integer uharm46Overtime;
|
||||
|
||||
private Integer uharm47Overtime;
|
||||
|
||||
private Integer uharm48Overtime;
|
||||
|
||||
private Integer uharm49Overtime;
|
||||
|
||||
private Integer uharm50Overtime;
|
||||
|
||||
|
||||
}
|
||||
@@ -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> {
|
||||
|
||||
}
|
||||
@@ -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> {
|
||||
|
||||
}
|
||||
@@ -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> {
|
||||
|
||||
}
|
||||
@@ -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> {
|
||||
|
||||
}
|
||||
@@ -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> {
|
||||
|
||||
}
|
||||
@@ -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> {
|
||||
|
||||
}
|
||||
@@ -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));
|
||||
|
||||
//月在运母线,电站数量取日的最大值
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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();
|
||||
|
||||
}
|
||||
@@ -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 {
|
||||
|
||||
}
|
||||
@@ -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 {
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user