ansteel.git - Gitblit

			@@ -3,6 +3,7 @@
			import cn.hutool.core.util.NumberUtil;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.iailab.framework.common.exception.ErrorCode;
			import com.iailab.framework.common.exception.enums.GlobalErrorCodeConstants;
			import com.iailab.framework.common.pojo.CommonResult;
			import com.iailab.framework.common.pojo.PageResult;
			@@ -38,6 +39,7 @@
			import java.util.*;
			import java.util.stream.Collectors;

			import static com.iailab.framework.common.pojo.CommonResult.error;
			import static com.iailab.framework.common.pojo.CommonResult.success;

			/**
			@@ -1107,15 +1109,12 @@
			@PostMapping("/power-maxdemand/page")
			@Operation(summary = "负荷移植-最大需量发生记录分页")
			public CommonResult<PageResult<PowerMaxDemandMainDTO>> getPowerMaxDemandMainPage(@RequestBody PowerMaxDemandMainPageReqVO reqVO) {
			if (StringUtils.isBlank(reqVO.getCode())) {
			log.info("code is blank");
			return error(GlobalErrorCodeConstants.BAD_REQUEST);
			}
			PageResult<PowerMaxdemandMainEntity> page = powerMaxDemandMainService.page(reqVO);
			PageResult<PowerMaxDemandMainDTO> result = BeanUtils.toBean(page, PowerMaxDemandMainDTO.class);
			/*List<String> parentIds = result.getList()
			.stream()
			.map(PowerMaxDemandMainDTO::getId)
			.collect(Collectors.toList());
			List<PowerMaxdemandDetEntity> children = powerMaxdemandDetService.selectListByRelIds(parentIds);
			Map<String, List<PowerMaxdemandDetEntity>> childrenMap = children.stream()
			.collect(Collectors.groupingBy(PowerMaxdemandDetEntity::getRelId));*/
			result.getList().forEach(dto0 -> {
			List<PowerMaxdemandDetEntity> detList0 = powerMaxdemandDetService.selectListByRelId(dto0.getId(), dto0.getOccurTime());
			dto0.setChildren(ConvertUtils.sourceToTarget(detList0, PowerMaxdemandDetDTO.class));

			@@ -1,5 +1,6 @@
			package com.iailab.module.ansteel.api.vo;

			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.iailab.framework.common.pojo.PageParam;
			import com.iailab.module.ansteel.power.entity.PowerMaxdemandDetEntity;
			import io.swagger.v3.oas.annotations.media.Schema;
			@@ -25,4 +26,12 @@

			@Schema(description = "名称")
			private String code;

			@Schema(description = "开始时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private Date startTime;

			@Schema(description = "结束时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private Date endTime;
			}

			@@ -19,6 +19,8 @@
			return selectPage(reqVO, new LambdaQueryWrapperX<PowerMaxdemandMainEntity>()
			.likeIfPresent(PowerMaxdemandMainEntity::getName, reqVO.getName())
			.eqIfPresent(PowerMaxdemandMainEntity::getCode, reqVO.getCode())
			.geIfPresent(PowerMaxdemandMainEntity::getOccurTime, reqVO.getStartTime())
			.le(PowerMaxdemandMainEntity::getOccurTime, reqVO.getEndTime())
			.orderByDesc(PowerMaxdemandMainEntity::getOccurTime));

			}

Binary files differ

	ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ansteel-biz/src/main/java/com/iailab/module/ansteel/api/vo/PowerMaxDemandMainPageReqVO.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ansteel-biz/src/main/java/com/iailab/module/ansteel/power/dao/PowerMaxdemandMainDao.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	doc/鞍钢数据接口文档_250512.doc	补丁 \| 查看 \| 原始文档 \| blame \| 历史