ansteel-biz/db/mysql.sql
@@ -651,5 +651,6 @@ `data_type` varchar(20) NULL DEFAULT NULL COMMENT '数据类型', `point_no` varchar(50) DEFAULT NULL COMMENT '点位', `sort` varchar(50) DEFAULT NULL COMMENT '排序', PRIMARY KEY (`id`) PRIMARY KEY (`id`), UNIQUE key uk_code (code) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='调整后的功率因数与无功倒送量'; ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java
@@ -158,8 +158,8 @@ @GetMapping("/net-factor-dropdown/list") @Operation(summary = "功率因数-电网拓扑下拉列表") public CommonResult<List<PowerNetFactorDropdownDTO>> getPowerNetFactorDropdownList(@RequestParam String nodeName) { List<PowerNetFactorEntity> list = powerNetFactorService.listDropdown(nodeName); public CommonResult<List<PowerNetFactorDropdownDTO>> getPowerNetFactorDropdownList(@RequestParam String nodeCode) { List<PowerNetFactorEntity> list = powerNetFactorService.listDropdown(nodeCode); List<PowerNetFactorDropdownDTO> result = ConvertUtils.sourceToTarget(list, PowerNetFactorDropdownDTO.class); return success(result); } @@ -467,6 +467,7 @@ List<PowerAdjustedFactorDTO> dtoList = ConvertUtils.sourceToTarget(list, PowerAdjustedFactorDTO.class); Map<String, Double> result = new HashMap<>(); if (CollectionUtils.isEmpty(list)) { log.info("PowerAdjustedFactor List is empty"); return success(result); } List<String> points = new ArrayList<>(); @@ -479,6 +480,7 @@ if (!CollectionUtils.isEmpty(points)) { dataMap = dataPointApi.queryPointsRealValue(points); } for (PowerAdjustedFactorDTO powerAdjustedFactorDTO : dtoList) { Double value = dataMap.get(powerAdjustedFactorDTO.getPointNo()) == null ? 0 : Double.parseDouble(dataMap.get(powerAdjustedFactorDTO.getPointNo()).toString()); result.put(powerAdjustedFactorDTO.getName(), value); ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/PowerNetFactorService.java
@@ -16,5 +16,5 @@ PowerNetFactorEntity getByNodeCode(String nodeCode); List<PowerNetFactorEntity> listDropdown(String nodeName); List<PowerNetFactorEntity> listDropdown(String nodeCode); } ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/impl/PowerNetFactorServiceImpl.java
@@ -5,6 +5,7 @@ import com.iailab.module.ansteel.power.entity.PowerNetFactorEntity; import com.iailab.module.ansteel.power.service.PowerNetFactorService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -40,9 +41,9 @@ } @Override public List<PowerNetFactorEntity> listDropdown(String nodeName) { public List<PowerNetFactorEntity> listDropdown(String nodeCode) { QueryWrapper<PowerNetFactorEntity> queryWrapper = new QueryWrapper<>(); queryWrapper.ne( "node_name",nodeName); queryWrapper.ne(StringUtils.isNotBlank(nodeCode), "node_code",nodeCode); queryWrapper.orderByAsc("sort"); return powerNetFactorDao.selectList(queryWrapper); }