zbj//1.稳态指标超标占比(负荷类型)
This commit is contained in:
@@ -27,6 +27,12 @@ public class AllDataVO implements Serializable {
|
|||||||
@ApiModelProperty("部门id")
|
@ApiModelProperty("部门id")
|
||||||
private String index;
|
private String index;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 监测点数量
|
||||||
|
*/
|
||||||
|
@ApiModelProperty("监测点数量")
|
||||||
|
private Integer num;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 暂降事件次数
|
* 暂降事件次数
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -273,6 +273,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
|
|||||||
AllDataVO allDataVO = largeScreenMapper.getFlagCount(generalDeviceDTO.getDeviceIndexes());
|
AllDataVO allDataVO = largeScreenMapper.getFlagCount(generalDeviceDTO.getDeviceIndexes());
|
||||||
allDataVO.setAreaName(generalDeviceDTO.getName());
|
allDataVO.setAreaName(generalDeviceDTO.getName());
|
||||||
allDataVO.setIndex(generalDeviceDTO.getIndex());
|
allDataVO.setIndex(generalDeviceDTO.getIndex());
|
||||||
|
allDataVO.setNum(generalDeviceDTO.getLineIndexes().size());
|
||||||
allDataVO.setSteadyLoad("0.0");
|
allDataVO.setSteadyLoad("0.0");
|
||||||
if (generalDeviceDTO.getLineIndexes().size() > 0) {
|
if (generalDeviceDTO.getLineIndexes().size() > 0) {
|
||||||
Map<String, Object> map = largeScreenMapper.getDownCount(generalDeviceDTO.getLineIndexes(), largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
|
Map<String, Object> map = largeScreenMapper.getDownCount(generalDeviceDTO.getLineIndexes(), largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
|
||||||
@@ -285,6 +286,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
|
|||||||
AllDataVO allDataVO = new AllDataVO();
|
AllDataVO allDataVO = new AllDataVO();
|
||||||
allDataVO.setAreaName(generalDeviceDTO.getName());
|
allDataVO.setAreaName(generalDeviceDTO.getName());
|
||||||
allDataVO.setIndex(generalDeviceDTO.getIndex());
|
allDataVO.setIndex(generalDeviceDTO.getIndex());
|
||||||
|
allDataVO.setNum(generalDeviceDTO.getLineIndexes().size());
|
||||||
allDataVO.setRunning("0");
|
allDataVO.setRunning("0");
|
||||||
allDataVO.setHotSpare("0");
|
allDataVO.setHotSpare("0");
|
||||||
allDataVO.setShutdown("0");
|
allDataVO.setShutdown("0");
|
||||||
@@ -382,7 +384,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
|
|||||||
vo.setIp(stringObjectMap.get("ip").toString());
|
vo.setIp(stringObjectMap.get("ip").toString());
|
||||||
vo.setPort(stringObjectMap.get("port").toString());
|
vo.setPort(stringObjectMap.get("port").toString());
|
||||||
vo.setComFlag(stringObjectMap.get("comFlag").toString());
|
vo.setComFlag(stringObjectMap.get("comFlag").toString());
|
||||||
vo.setProportion(s + "%");
|
vo.setProportion(s);
|
||||||
result.add(vo);
|
result.add(vo);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
@@ -392,7 +394,8 @@ public class LargeScreenServiceImpl implements LargeScreenService {
|
|||||||
NumberFormat nf = NumberFormat.getNumberInstance();
|
NumberFormat nf = NumberFormat.getNumberInstance();
|
||||||
nf.setMaximumFractionDigits(2);//保留两位小数,即四舍五入到小数点后两位
|
nf.setMaximumFractionDigits(2);//保留两位小数,即四舍五入到小数点后两位
|
||||||
nf.setRoundingMode(RoundingMode.HALF_UP);//设置四舍五入模式为四舍五入
|
nf.setRoundingMode(RoundingMode.HALF_UP);//设置四舍五入模式为四舍五入
|
||||||
return nf.format(value);
|
float v = Float.parseFloat(nf.format(value));
|
||||||
|
return String.valueOf(v*100);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -49,4 +49,17 @@ public class LargeScreenController extends BaseController {
|
|||||||
List<HomeostasisAreaVO> result = largeScreenService.getHomeostasisArea(largeScreenParam);
|
List<HomeostasisAreaVO> result = largeScreenService.getHomeostasisArea(largeScreenParam);
|
||||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 稳态指标超标占比(负荷类型)
|
||||||
|
*/
|
||||||
|
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||||
|
@PostMapping("/getHomeostasisLoad")
|
||||||
|
@ApiOperation("稳态指标超标占比(负荷类型)")
|
||||||
|
@ApiImplicitParam(name = "largeScreenParam", value = "稳态指标超标占比(负荷类型)", required = true)
|
||||||
|
public HttpResult<List<HomeostasisAreaVO>> getHomeostasisLoad(@RequestBody @Validated LargeScreenParam largeScreenParam) {
|
||||||
|
String methodDescribe = getMethodDescribe("getHomeostasisLoad");
|
||||||
|
List<HomeostasisAreaVO> result = largeScreenService.getHomeostasisLoad(largeScreenParam);
|
||||||
|
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,4 +13,7 @@ import java.util.Map;
|
|||||||
public interface LargeScreenMapper {
|
public interface LargeScreenMapper {
|
||||||
|
|
||||||
List<Map<String,Object>> getHomeostasisArea (@Param("indexIds") List<String> indexIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
|
List<Map<String,Object>> getHomeostasisArea (@Param("indexIds") List<String> indexIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
|
||||||
|
|
||||||
|
List<Map<String,Object>> getHomeostasisLoad (@Param("indexIds") List<String> indexIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.njcn.harmonic.mapper.majornetwork.LargeScreenMapper">
|
<mapper namespace="com.njcn.harmonic.mapper.majornetwork.LargeScreenMapper">
|
||||||
|
|
||||||
|
|
||||||
<select id="getHomeostasisArea" resultType="java.util.Map">
|
<select id="getHomeostasisArea" resultType="java.util.Map">
|
||||||
select
|
select
|
||||||
rshom.org_no "id",
|
rshom.org_no "id",
|
||||||
@@ -22,4 +21,24 @@
|
|||||||
</if>
|
</if>
|
||||||
group by rshom.org_no
|
group by rshom.org_no
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="getHomeostasisLoad" resultType="java.util.Map">
|
||||||
|
select
|
||||||
|
rshom.measurement_type_class "id",
|
||||||
|
round(avg(rshom.over_limit_measurement_ratio_accrued),2) avg
|
||||||
|
from r_stat_harmonic_m rshom
|
||||||
|
left join sys_dict_data sdd on rshom.data_type = sdd.Id and sdd.`Code` = 'Mainnet_Point'
|
||||||
|
WHERE
|
||||||
|
rshom.measurement_type_class IN
|
||||||
|
<foreach collection="indexIds" item="item" open="(" close=")" separator=",">
|
||||||
|
#{item}
|
||||||
|
</foreach>
|
||||||
|
<if test="startTime != null and startTime != ''">
|
||||||
|
and date_format(rshom.data_date,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
|
||||||
|
</if>
|
||||||
|
<if test="endTime != null and endTime != ''">
|
||||||
|
and date_format(rshom.data_date,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
|
||||||
|
</if>
|
||||||
|
group by rshom.measurement_type_class
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
@@ -14,4 +14,7 @@ import java.util.List;
|
|||||||
public interface LargeScreenService {
|
public interface LargeScreenService {
|
||||||
|
|
||||||
List<HomeostasisAreaVO> getHomeostasisArea(LargeScreenParam largeScreenParam);
|
List<HomeostasisAreaVO> getHomeostasisArea(LargeScreenParam largeScreenParam);
|
||||||
|
|
||||||
|
List<HomeostasisAreaVO> getHomeostasisLoad(LargeScreenParam largeScreenParam);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,21 +62,77 @@ public class LargeScreenServiceImpl implements LargeScreenService {
|
|||||||
|
|
||||||
List<Map<String, Object>> homeostasisArea = largeScreenMapper.getHomeostasisArea(indexIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
|
List<Map<String, Object>> homeostasisArea = largeScreenMapper.getHomeostasisArea(indexIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
|
||||||
|
|
||||||
for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
|
float f = 0.0f;
|
||||||
|
for (int i = 0; i < generalDeviceDTOList.size(); i++) {
|
||||||
for (Map<String, Object> map : homeostasisArea) {
|
for (Map<String, Object> map : homeostasisArea) {
|
||||||
if (Objects.equals(generalDeviceDTO.getIndex(), map.get("id"))) {
|
if (Objects.equals(generalDeviceDTOList.get(i).getIndex(), map.get("id"))) {
|
||||||
HomeostasisAreaVO homeostasisAreaVO = new HomeostasisAreaVO();
|
HomeostasisAreaVO homeostasisAreaVO = new HomeostasisAreaVO();
|
||||||
homeostasisAreaVO.setName(generalDeviceDTO.getName());
|
homeostasisAreaVO.setName(generalDeviceDTOList.get(i).getName());
|
||||||
homeostasisAreaVO.setAvg(map.get("avg").toString());
|
f = Float.parseFloat(map.get("avg").toString()) * 100;
|
||||||
|
homeostasisAreaVO.setAvg(String.valueOf(f));
|
||||||
result.add(homeostasisAreaVO);
|
result.add(homeostasisAreaVO);
|
||||||
} else {
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
List<String> collect = result.stream().map(HomeostasisAreaVO::getName).collect(Collectors.toList());
|
||||||
|
for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
|
||||||
|
if (!collect.contains(generalDeviceDTO.getName())) {
|
||||||
HomeostasisAreaVO homeostasisAreaVO = new HomeostasisAreaVO();
|
HomeostasisAreaVO homeostasisAreaVO = new HomeostasisAreaVO();
|
||||||
homeostasisAreaVO.setName(generalDeviceDTO.getName());
|
homeostasisAreaVO.setName(generalDeviceDTO.getName());
|
||||||
homeostasisAreaVO.setAvg("0");
|
homeostasisAreaVO.setAvg("0");
|
||||||
result.add(homeostasisAreaVO);
|
result.add(homeostasisAreaVO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 稳态指标超标占比(负荷类型)
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public List<HomeostasisAreaVO> getHomeostasisLoad(LargeScreenParam largeScreenParam) {
|
||||||
|
//创建返回VO
|
||||||
|
List<HomeostasisAreaVO> result = new ArrayList<>();
|
||||||
|
|
||||||
|
DeviceInfoParam.BusinessParam deviceInfoParam = new DeviceInfoParam.BusinessParam();
|
||||||
|
//部门索引
|
||||||
|
deviceInfoParam.setDeptIndex(largeScreenParam.getDeptIndex());
|
||||||
|
//统计类型
|
||||||
|
SimpleDTO simpleDTO = new SimpleDTO();
|
||||||
|
simpleDTO.setCode(String.valueOf(StatisticsEnum.LOAD_TYPE));
|
||||||
|
deviceInfoParam.setStatisticalType(simpleDTO);
|
||||||
|
//添加时间
|
||||||
|
deviceInfoParam.setSearchBeginTime(largeScreenParam.getSearchBeginTime());
|
||||||
|
deviceInfoParam.setSearchEndTime(largeScreenParam.getSearchEndTime());
|
||||||
|
|
||||||
|
// 获取所有数据
|
||||||
|
List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData();
|
||||||
|
//部门id集合
|
||||||
|
List<String> indexIds = generalDeviceDTOList.stream().map(GeneralDeviceDTO::getIndex).collect(Collectors.toList());
|
||||||
|
|
||||||
|
List<Map<String, Object>> homeostasisArea = largeScreenMapper.getHomeostasisLoad(indexIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
|
||||||
|
float f = 0.0f;
|
||||||
|
for (int i = 0; i < generalDeviceDTOList.size(); i++) {
|
||||||
|
for (Map<String, Object> map : homeostasisArea) {
|
||||||
|
if (Objects.equals(generalDeviceDTOList.get(i).getIndex(), map.get("id"))) {
|
||||||
|
HomeostasisAreaVO homeostasisAreaVO = new HomeostasisAreaVO();
|
||||||
|
homeostasisAreaVO.setName(generalDeviceDTOList.get(i).getName());
|
||||||
|
f = Float.parseFloat(map.get("avg").toString()) * 100;
|
||||||
|
homeostasisAreaVO.setAvg(String.valueOf(f));
|
||||||
|
result.add(homeostasisAreaVO);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
List<String> collect = result.stream().map(HomeostasisAreaVO::getName).collect(Collectors.toList());
|
||||||
|
for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
|
||||||
|
if (!collect.contains(generalDeviceDTO.getName())) {
|
||||||
|
HomeostasisAreaVO homeostasisAreaVO = new HomeostasisAreaVO();
|
||||||
|
homeostasisAreaVO.setName(generalDeviceDTO.getName());
|
||||||
|
homeostasisAreaVO.setAvg("0");
|
||||||
|
result.add(homeostasisAreaVO);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user