ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java
@@ -2,10 +2,9 @@ import com.iailab.framework.common.pojo.CommonResult; import com.iailab.module.ansteel.api.dto.*; import com.iailab.module.ansteel.api.service.DataApi; import com.iailab.module.ansteel.api.service.DataService; import com.iailab.module.model.api.mcs.dto.PreDataSingleChartReqVO; import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestReqVO; import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestRespVO; import io.swagger.v3.oas.annotations.Operation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -25,60 +24,34 @@ public class DataController { @Autowired private DataApi dataApi; private DataService dataService; @GetMapping("/power-run-state/list") @Operation(summary = "发电厂机组运行情况") public CommonResult<List<PowerRunStateDTO>> getPowerRunState(@RequestParam Map<String, Object> params) { List<PowerRunStateDTO> list = dataApi.getPowerRunState(); List<PowerRunStateDTO> list = dataService.getPowerRunState(); return success(list); } @PostMapping("/predict-data/charts") @Operation(summary = "预测数据图表") public CommonResult<PreDataChartRespVO> getPreDataChart(@RequestBody PreDataSingleChartReqVO reqVO) { PreDataChartRespVO respVO = dataApi.getPreDataChart(reqVO); PreDataChartRespVO respVO = dataService.getPreDataChart(reqVO); return CommonResult.success(respVO); } @PostMapping("/plan-data/charts") @Operation(summary = "计划数据图表") public CommonResult<Map<String, Object>> getPlanDataChart(@RequestBody PlanDataChartReqVO reqVO) { Map<String, Object> tMap = dataApi.getPlanDataChart(reqVO); Map<String, Object> tMap = dataService.getPlanDataChart(reqVO); return CommonResult.success(tMap); } @PostMapping("/schedule-suggest/use-suggest") @Operation(summary = "采纳建议") public CommonResult<Boolean> useSuggest(@RequestBody StAlarmAndSuggestReqVO ReqVO) { return success(dataApi.useSuggest(ReqVO)); return success(dataService.useSuggest(ReqVO)); } @GetMapping("/power-net-factor/list") @Operation(summary = "电力功率因数-电网拓扑") public CommonResult<List<PowerNetFactorDTO>> getPowerNetFactorList(@RequestParam Map<String, Object> params) { List<PowerNetFactorDTO> list = dataApi.getPowerNetFactorList(); return success(list); } @GetMapping("/power-capacitor-status/list") @Operation(summary = "电力功率因数-电容器投运状态") public CommonResult<List<PowerCapacitorStatusDTO>> getPowerCapacitorStatusList(@RequestParam Map<String, Object> params) { List<PowerCapacitorStatusDTO> list = dataApi.getPowerCapacitorStatusList(); return success(list); } @GetMapping("/power-control-main/list") @Operation(summary = "电力功率因数-管控功率因数主表") public CommonResult<List<PowerControlMainDTO>> getPowerControlMainList(@RequestParam Map<String, Object> params) { List<PowerControlMainDTO> list = dataApi.getPowerControlMainList(); return success(list); } @GetMapping("/power-control-det/list") @Operation(summary = "电力功率因数-管控功率因数子表") public CommonResult<List<PowerControlDetDTO>> getPowerControlDetList(@RequestParam Map<String, Object> params) { List<PowerControlDetDTO> list = dataApi.getPowerControlDetList(params); return success(list); } } ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
@@ -1,8 +1,29 @@ package com.iailab.module.ansteel.api.controller.admin; import com.iailab.framework.common.pojo.CommonResult; import com.iailab.framework.common.util.object.ConvertUtils; import com.iailab.module.ansteel.api.dto.PowerCapacitorStatusDTO; import com.iailab.module.ansteel.api.dto.PowerControlDetDTO; import com.iailab.module.ansteel.api.dto.PowerControlMainDTO; import com.iailab.module.ansteel.api.dto.PowerNetFactorDTO; import com.iailab.module.ansteel.api.entity.PowerControlMainEntity; import com.iailab.module.ansteel.api.entity.PowerNetFactorEntity; import com.iailab.module.ansteel.api.entity.PowerRunStateEntity; import com.iailab.module.ansteel.api.service.PowerControlMainService; import com.iailab.module.ansteel.api.service.PowerNetFactorService; import com.iailab.module.ansteel.api.service.PowerRunStateService; import io.swagger.v3.oas.annotations.Operation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.Map; import static com.iailab.framework.common.pojo.CommonResult.success; /** * 电力接口 @@ -15,4 +36,41 @@ @RestController @RequestMapping("/ansteel/api/power") public class PowerController { @Autowired private PowerNetFactorService powerNetFactorService; @Autowired private PowerRunStateService powerRunStateService; @Autowired private PowerControlMainService powerControlMainService; @GetMapping("/net-factor/list") @Operation(summary = "电力功率因数-电网拓扑") public CommonResult<List<PowerNetFactorDTO>> getPowerNetFactorList(@RequestParam Map<String, Object> params) { List<PowerNetFactorEntity> list = powerNetFactorService.list(params); return success(ConvertUtils.sourceToTarget(list, PowerNetFactorDTO.class)); } @GetMapping("/capacitor-status/list") @Operation(summary = "电力功率因数-电容器投运状态") public CommonResult<List<PowerCapacitorStatusDTO>> getPowerCapacitorStatusList(@RequestParam Map<String, Object> params) { List<PowerRunStateEntity> list = powerRunStateService.list(params); return success(ConvertUtils.sourceToTarget(list, PowerCapacitorStatusDTO.class)); } @GetMapping("/control-main/list") @Operation(summary = "电力功率因数-管控功率因数主表") public CommonResult<List<PowerControlMainDTO>> getPowerControlMainList(@RequestParam Map<String, Object> params) { List<PowerControlMainEntity> list = powerControlMainService.list(params); return success(ConvertUtils.sourceToTarget(list, PowerControlMainDTO.class)); } @GetMapping("/control-det/list") @Operation(summary = "电力功率因数-管控功率因数子表") public CommonResult<List<PowerControlDetDTO>> getPowerControlDetList(@RequestParam Map<String, Object> params) { List<PowerControlMainEntity> list = powerControlMainService.list(params); return success(ConvertUtils.sourceToTarget(list, PowerControlDetDTO.class)); } } ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dao/PowerCapacitorStatusDao.java
@@ -1,11 +1,9 @@ package com.iailab.module.ansteel.api.dao; import com.iailab.framework.common.dao.BaseDao; import com.iailab.framework.tenant.core.db.dynamic.TenantDS; import com.iailab.module.ansteel.api.entity.PowerCapacitorStatusEntity; import org.apache.ibatis.annotations.Mapper; @TenantDS @Mapper public interface PowerCapacitorStatusDao extends BaseDao<PowerCapacitorStatusEntity> { ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dao/PowerControlDetDao.java
@@ -1,11 +1,9 @@ package com.iailab.module.ansteel.api.dao; import com.iailab.framework.common.dao.BaseDao; import com.iailab.framework.tenant.core.db.dynamic.TenantDS; import com.iailab.module.ansteel.api.entity.PowerControlDetEntity; import org.apache.ibatis.annotations.Mapper; @TenantDS @Mapper public interface PowerControlDetDao extends BaseDao<PowerControlDetEntity> { ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dao/PowerControlMainDao.java
@@ -1,11 +1,9 @@ package com.iailab.module.ansteel.api.dao; import com.iailab.framework.common.dao.BaseDao; import com.iailab.framework.tenant.core.db.dynamic.TenantDS; import com.iailab.module.ansteel.api.entity.PowerControlMainEntity; import org.apache.ibatis.annotations.Mapper; @TenantDS @Mapper public interface PowerControlMainDao extends BaseDao<PowerControlMainEntity> { ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dao/PowerNetFactorDao.java
@@ -1,11 +1,9 @@ package com.iailab.module.ansteel.api.dao; import com.iailab.framework.common.dao.BaseDao; import com.iailab.framework.tenant.core.db.dynamic.TenantDS; import com.iailab.module.ansteel.api.entity.PowerNetFactorEntity; import org.apache.ibatis.annotations.Mapper; @TenantDS @Mapper public interface PowerNetFactorDao extends BaseDao<PowerNetFactorEntity> { ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dao/PowerRunStateDao.java
@@ -1,11 +1,9 @@ package com.iailab.module.ansteel.api.dao; import com.iailab.framework.common.dao.BaseDao; import com.iailab.framework.tenant.core.db.dynamic.TenantDS; import com.iailab.module.ansteel.api.entity.PowerRunStateEntity; import org.apache.ibatis.annotations.Mapper; @TenantDS @Mapper public interface PowerRunStateDao extends BaseDao<PowerRunStateEntity> { ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/DataService.java
文件名从 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/DataApi.java 修改 @@ -3,7 +3,6 @@ import com.iailab.module.ansteel.api.dto.*; import com.iailab.module.model.api.mcs.dto.PreDataSingleChartReqVO; import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestReqVO; import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestRespVO; import java.util.List; import java.util.Map; @@ -13,7 +12,7 @@ * @Description * @createTime 2025年03月17日 */ public interface DataApi { public interface DataService { List<PowerRunStateDTO> getPowerRunState(); ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/PowerCapacitorStatusService.java
对比新文件 @@ -0,0 +1,16 @@ package com.iailab.module.ansteel.api.service; import com.iailab.module.ansteel.api.entity.PowerCapacitorStatusEntity; import java.util.List; import java.util.Map; /** * @author PanZhibao * @Description * @createTime 2025年04月11日 */ public interface PowerCapacitorStatusService { List<PowerCapacitorStatusEntity> list(Map<String, Object> params); } ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/PowerControlDetService.java
对比新文件 @@ -0,0 +1,16 @@ package com.iailab.module.ansteel.api.service; import com.iailab.module.ansteel.api.entity.PowerControlDetEntity; import java.util.List; import java.util.Map; /** * @author PanZhibao * @Description * @createTime 2025年04月11日 */ public interface PowerControlDetService { List<PowerControlDetEntity> list(Map<String, Object> params); } ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/PowerControlMainService.java
对比新文件 @@ -0,0 +1,16 @@ package com.iailab.module.ansteel.api.service; import com.iailab.module.ansteel.api.entity.PowerControlMainEntity; import java.util.List; import java.util.Map; /** * @author PanZhibao * @Description * @createTime 2025年04月11日 */ public interface PowerControlMainService { List<PowerControlMainEntity> list(Map<String, Object> params); } ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/PowerNetFactorService.java
对比新文件 @@ -0,0 +1,16 @@ package com.iailab.module.ansteel.api.service; import com.iailab.module.ansteel.api.entity.PowerNetFactorEntity; import java.util.List; import java.util.Map; /** * @author PanZhibao * @Description * @createTime 2025年04月11日 */ public interface PowerNetFactorService { List<PowerNetFactorEntity> list(Map<String, Object> params); } ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/PowerRunStateService.java
对比新文件 @@ -0,0 +1,16 @@ package com.iailab.module.ansteel.api.service; import com.iailab.module.ansteel.api.entity.PowerRunStateEntity; import java.util.List; import java.util.Map; /** * @author PanZhibao * @Description * @createTime 2025年04月11日 */ public interface PowerRunStateService { List<PowerRunStateEntity> list(Map<String, Object> params); } ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
@@ -9,7 +9,7 @@ import com.iailab.module.ansteel.api.entity.PowerControlDetEntity; import com.iailab.module.ansteel.api.entity.PowerControlMainEntity; import com.iailab.module.ansteel.api.entity.PowerNetFactorEntity; import com.iailab.module.ansteel.api.service.DataApi; import com.iailab.module.ansteel.api.service.DataService; import com.iailab.module.ansteel.common.constant.CommonConstant; import com.iailab.module.data.api.plan.PlanItemApi; import com.iailab.module.data.api.plan.dto.ApiPlanDataDTO; @@ -31,7 +31,7 @@ @Slf4j @Service public class DataServiceImpl implements DataApi { public class DataServiceImpl implements DataService { @Autowired private DataPointApi dataPointApi; ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/PowerCapacitorStatusServiceImpl.java
对比新文件 @@ -0,0 +1,33 @@ package com.iailab.module.ansteel.api.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iailab.module.ansteel.api.dao.PowerCapacitorStatusDao; import com.iailab.module.ansteel.api.entity.PowerCapacitorStatusEntity; import com.iailab.module.ansteel.api.service.PowerCapacitorStatusService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; import java.util.Map; /** * @author PanZhibao * @Description * @createTime 2025年04月11日 */ @Slf4j @Service public class PowerCapacitorStatusServiceImpl implements PowerCapacitorStatusService { @Resource private PowerCapacitorStatusDao powerCapacitorStatusDao; @Override public List<PowerCapacitorStatusEntity> list(Map<String, Object> params) { QueryWrapper<PowerCapacitorStatusEntity> queryWrapper = new QueryWrapper<>(); queryWrapper.orderByAsc("sort"); return powerCapacitorStatusDao.selectList(queryWrapper); } } ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/PowerControlDetServiceImpl.java
对比新文件 @@ -0,0 +1,32 @@ package com.iailab.module.ansteel.api.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iailab.module.ansteel.api.dao.PowerControlDetDao; import com.iailab.module.ansteel.api.entity.PowerControlDetEntity; import com.iailab.module.ansteel.api.service.PowerControlDetService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; import java.util.Map; /** * @author PanZhibao * @Description * @createTime 2025年04月11日 */ @Slf4j @Service public class PowerControlDetServiceImpl implements PowerControlDetService { @Resource private PowerControlDetDao powerControlDetDao; @Override public List<PowerControlDetEntity> list(Map<String, Object> params) { QueryWrapper<PowerControlDetEntity> queryWrapper = new QueryWrapper<>(); queryWrapper.orderByAsc("sort"); return powerControlDetDao.selectList(queryWrapper); } } ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/PowerControlMainServiceImpl.java
对比新文件 @@ -0,0 +1,32 @@ package com.iailab.module.ansteel.api.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iailab.module.ansteel.api.dao.PowerControlMainDao; import com.iailab.module.ansteel.api.entity.PowerControlMainEntity; import com.iailab.module.ansteel.api.service.PowerControlMainService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; import java.util.Map; /** * @author PanZhibao * @Description * @createTime 2025年04月11日 */ @Slf4j @Service public class PowerControlMainServiceImpl implements PowerControlMainService { @Resource private PowerControlMainDao powerControlMainDao; @Override public List<PowerControlMainEntity> list(Map<String, Object> params) { QueryWrapper<PowerControlMainEntity> queryWrapper = new QueryWrapper<>(); queryWrapper.orderByAsc("sort"); return powerControlMainDao.selectList(queryWrapper); } } ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/PowerNetFactorServiceImpl.java
对比新文件 @@ -0,0 +1,33 @@ package com.iailab.module.ansteel.api.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iailab.module.ansteel.api.dao.PowerNetFactorDao; import com.iailab.module.ansteel.api.entity.PowerNetFactorEntity; import com.iailab.module.ansteel.api.service.PowerNetFactorService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; import java.util.Map; /** * @author PanZhibao * @Description * @createTime 2025年04月11日 */ @Slf4j @Service public class PowerNetFactorServiceImpl implements PowerNetFactorService { @Resource private PowerNetFactorDao powerNetFactorDao; @Override public List<PowerNetFactorEntity> list(Map<String, Object> params) { QueryWrapper<PowerNetFactorEntity> queryWrapper = new QueryWrapper<>(); queryWrapper.orderByAsc("sort"); return powerNetFactorDao.selectList(queryWrapper); } } ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/PowerRunStateServiceImpl.java
对比新文件 @@ -0,0 +1,33 @@ package com.iailab.module.ansteel.api.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iailab.module.ansteel.api.dao.PowerRunStateDao; import com.iailab.module.ansteel.api.entity.PowerRunStateEntity; import com.iailab.module.ansteel.api.service.PowerRunStateService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; import java.util.Map; /** * @author PanZhibao * @Description * @createTime 2025年04月11日 */ @Slf4j @Service public class PowerRunStateServiceImpl implements PowerRunStateService { @Resource private PowerRunStateDao powerRunStateDao; @Override public List<PowerRunStateEntity> list(Map<String, Object> params) { QueryWrapper<PowerRunStateEntity> queryWrapper = new QueryWrapper<>(); queryWrapper.orderByAsc("sort"); return powerRunStateDao.selectList(queryWrapper); } } ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/package-info.java
文件已删除