ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java
@@ -3,6 +3,7 @@ import com.iailab.framework.common.pojo.CommonResult; import com.iailab.framework.common.util.object.ConvertUtils; import com.iailab.module.ansteel.api.dto.*; import com.iailab.module.ansteel.coking.dto.CokingTraceEnergyDTO; import com.iailab.module.ansteel.coking.entity.*; import com.iailab.module.ansteel.coking.service.*; import io.swagger.v3.oas.annotations.Operation; @@ -45,6 +46,9 @@ @Autowired private CokingProdDayService cokingProdDayService; @Autowired private CokingTraceEnergyService cokingTraceEnergyService; @GetMapping("/analy-ind/list") @Operation(summary = "焦化工序-指标分析") public CommonResult<List<CokingAnalyIndDTO>> getCokingAnalyIndList(@RequestParam Map<String, Object> params) { @@ -79,4 +83,12 @@ List<CokingProdDayEntity> list = cokingProdDayService.list(params); return success(ConvertUtils.sourceToTarget(list, CokingProdDayDTO.class)); } @GetMapping("/trace-energy/list") @Operation(summary = "焦化工序-能耗整体情况") public CommonResult<Map<String,List<CokingTraceEnergyDTO>>> getEnergyConsumptionList(@RequestParam Map<String, Object> params) { Map<String,List<CokingTraceEnergyDTO>> result = cokingTraceEnergyService.list(params); return success(result); } } ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/CokingTraceEnergyService.java
@@ -1,6 +1,7 @@ package com.iailab.module.ansteel.coking.service; import com.iailab.module.ansteel.coking.dto.CokingTraceEnergyDTO; import com.iailab.module.ansteel.coking.entity.CokingTraceEnergyEntity; import java.util.List; @@ -13,5 +14,5 @@ * @since 1.0.0 2025-04-16 */ public interface CokingTraceEnergyService { List<CokingTraceEnergyEntity> list(Map<String, Object> params); Map<String,List<CokingTraceEnergyDTO>> list(Map<String, Object> params); } ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingTraceEnergyServiceImpl.java
@@ -1,14 +1,20 @@ package com.iailab.module.ansteel.coking.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iailab.framework.common.util.date.DateUtils; import com.iailab.framework.common.util.object.ConvertUtils; import com.iailab.module.ansteel.coking.dao.CokingTraceEnergyDao; import com.iailab.module.ansteel.coking.dto.CokingTraceEnergyDTO; import com.iailab.module.ansteel.coking.entity.CokingProdDayEntity; import com.iailab.module.ansteel.coking.entity.CokingTraceEnergyEntity; import com.iailab.module.ansteel.coking.service.CokingTraceEnergyService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; import java.util.*; import static com.iailab.framework.common.pojo.CommonResult.success; /** * 焦化工序能耗整体情况 @@ -23,7 +29,37 @@ private CokingTraceEnergyDao cokingTraceEnergyDao; @Override public List<CokingTraceEnergyEntity> list(Map<String, Object> params) { return cokingTraceEnergyDao.selectList(new QueryWrapper<>()); public Map<String,List<CokingTraceEnergyDTO>> list(Map<String, Object> params) { Map<String,List<CokingTraceEnergyDTO>> result = new HashMap<>(2); String clock = (String) params.get("clock"); String month; if (StringUtils.isBlank(clock)) { Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DAY_OF_YEAR, -1); clock = DateUtils.format(calendar.getTime(), "yyyy-MM-dd"); month = DateUtils.format(calendar.getTime(), "yyyy-MM"); }else { Date parse = DateUtils.parse(clock, "yyyy-MM-dd"); month = DateUtils.format(parse, "yyyy-MM"); } // 天数据 QueryWrapper<CokingTraceEnergyEntity> queryWrapperDay = new QueryWrapper<>(); queryWrapperDay.eq("clock", clock); List<CokingTraceEnergyEntity> dayList = cokingTraceEnergyDao.selectList(queryWrapperDay); result.put("day",ConvertUtils.sourceToTarget(dayList,CokingTraceEnergyDTO.class)); // 月数据 QueryWrapper<CokingTraceEnergyEntity> queryWrapperMonth = new QueryWrapper<>(); queryWrapperMonth.like("clock", month); queryWrapperMonth.select("type","SUM(steam_p) as steam_p","SUM(steam_c) as steam_c","SUM(gas_p) as gas_p","SUM(gas_c) as gas_c","SUM(power_c) as power_c") .groupBy("type"); List<CokingTraceEnergyEntity> monthList = cokingTraceEnergyDao.selectList(queryWrapperMonth); monthList.forEach(e -> e.setClock(month)); result.put("month",ConvertUtils.sourceToTarget(monthList,CokingTraceEnergyDTO.class)); return result; } } ansteel-biz/src/main/java/com/iailab/module/ansteel/common/enums/ProcessTypeEnum.java
对比新文件 @@ -0,0 +1,38 @@ package com.iailab.module.ansteel.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; /** * @description: 工序 * @author: dzd * @date: 2025/4/17 15:58 **/ @Getter @AllArgsConstructor public enum ProcessTypeEnum { GL("GL", "鼓冷"), LA("LA", "硫铵"), CB("CB", "粗苯"), TL("TL", "脱硫"), GXJ_1("GXJ_1", "1#干熄焦"), GXJ_2("GXJ_2", "2#干熄焦"), GXJ_3("GXJ_3", "3#干熄焦"), ALL("ALL", "总体"); private String code; private String desc; public static ProcessTypeEnum getEumByCode(Integer code) { if (code == null) { return null; } for (ProcessTypeEnum statusEnum : ProcessTypeEnum.values()) { if (statusEnum.getCode().equals(code)) { return statusEnum; } } return null; } } doc/鞍钢数据接口文档_dev_deng.docBinary files differ
