zbj//1.功率负荷排名
This commit is contained in:
zhangbaojian
@@ -29,4 +29,6 @@ public class LargeScreenParam implements Serializable {
|
||||
@Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误")
|
||||
private String searchEndTime;
|
||||
|
||||
@ApiModelProperty("返回条数")
|
||||
private Integer limit;
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package com.njcn.device.pq.pojo.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @version 1.0.0
|
||||
* @author: zbj
|
||||
* @date: 2023/04/14
|
||||
*/
|
||||
@Data
|
||||
public class PowerOrderVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
@ApiModelProperty("名称")
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 功率最大值
|
||||
*/
|
||||
@ApiModelProperty("功率最大值")
|
||||
private String max;
|
||||
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@ApiModelProperty("id")
|
||||
private String id;
|
||||
}
|
||||
@@ -6,7 +6,6 @@ import com.njcn.common.pojo.enums.common.LogEnum;
|
||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
||||
import com.njcn.common.pojo.response.HttpResult;
|
||||
import com.njcn.common.utils.HttpResultUtil;
|
||||
import com.njcn.device.pq.pojo.param.DeviceLogParam;
|
||||
import com.njcn.device.pq.pojo.param.LogsListParam;
|
||||
import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
|
||||
import com.njcn.device.pq.pojo.vo.LogsListVO;
|
||||
|
||||
@@ -2,13 +2,11 @@ package com.njcn.device.pq.mapper;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.njcn.device.pq.pojo.param.LogsListParam;
|
||||
import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
|
||||
import com.njcn.device.pq.pojo.vo.LogsListVO;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.njcn.device.pq.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.njcn.device.pq.pojo.param.DeviceLogParam;
|
||||
import com.njcn.device.pq.pojo.param.LogsListParam;
|
||||
import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
|
||||
import com.njcn.device.pq.pojo.vo.LogsListVO;
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package com.njcn.device.pq.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.njcn.device.pq.mapper.PqsTerminalLogsMapper;
|
||||
import com.njcn.device.pq.pojo.param.LogsListParam;
|
||||
@@ -11,7 +9,6 @@ import com.njcn.device.pq.service.IPqsTerminalLogsService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@@ -62,4 +62,17 @@ public class LargeScreenController extends BaseController {
|
||||
List<HomeostasisAreaVO> result = largeScreenService.getHomeostasisLoad(largeScreenParam);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
/**
|
||||
* 功率负荷排名
|
||||
*/
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/getPowerOrder")
|
||||
@ApiOperation("功率负荷排名")
|
||||
@ApiImplicitParam(name = "largeScreenParam", value = "功率负荷排名", required = true)
|
||||
public HttpResult<List<PowerOrderVO>> getPowerOrder(@RequestBody @Validated LargeScreenParam largeScreenParam) {
|
||||
String methodDescribe = getMethodDescribe("getHomeostasisLoad");
|
||||
List<PowerOrderVO> result = largeScreenService.getPowerOrder(largeScreenParam);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.njcn.harmonic.mapper.majornetwork;
|
||||
|
||||
import com.njcn.device.pq.pojo.param.LargeScreenParam;
|
||||
import com.njcn.device.pq.pojo.vo.PowerOrderVO;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
@@ -16,4 +18,6 @@ public interface LargeScreenMapper {
|
||||
|
||||
List<Map<String,Object>> getHomeostasisLoad (@Param("indexIds") List<String> indexIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
|
||||
|
||||
List<PowerOrderVO> getPowerOrder (LargeScreenParam largeScreenParam);
|
||||
|
||||
}
|
||||
|
||||
@@ -41,4 +41,19 @@
|
||||
</if>
|
||||
group by rshom.measurement_type_class
|
||||
</select>
|
||||
|
||||
<select id="getPowerOrder" resultType="com.njcn.device.pq.pojo.vo.PowerOrderVO">
|
||||
select t.*, pl.`Name` "name"
|
||||
from (
|
||||
SELECT rsdhpd.line_id "id", round(max(rsdhpd.p), 0) "max"
|
||||
FROM r_stat_data_harmpower_p_d rsdhpd
|
||||
where rsdhpd.value_type = 'MAX'
|
||||
AND rsdhpd.time BETWEEN date_format(#{searchBeginTime}, '%y%m%d')
|
||||
AND date_format(#{searchEndTime}, '%y%m%d')
|
||||
group by rsdhpd.line_id
|
||||
) t
|
||||
left join pq_line pl on pl.Id = t.id
|
||||
ORDER BY t.max desc limit #{limit}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
@@ -17,4 +17,5 @@ public interface LargeScreenService {
|
||||
|
||||
List<HomeostasisAreaVO> getHomeostasisLoad(LargeScreenParam largeScreenParam);
|
||||
|
||||
List<PowerOrderVO> getPowerOrder(LargeScreenParam largeScreenParam);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.njcn.harmonic.service.majornetwork.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.njcn.common.pojo.dto.SimpleDTO;
|
||||
import com.njcn.device.pq.api.GeneralDeviceInfoClient;
|
||||
import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
|
||||
@@ -135,4 +136,11 @@ public class LargeScreenServiceImpl implements LargeScreenService {
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 功率负荷排名
|
||||
*/
|
||||
@Override
|
||||
public List<PowerOrderVO> getPowerOrder(LargeScreenParam largeScreenParam) {
|
||||
return largeScreenMapper.getPowerOrder(largeScreenParam);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user