电容器投退历史 接口修改

 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java

@@ -520,7 +520,14 @@
    @GetMapping("/capacitor-his/list")
    @Operation(summary = "功率因数-电容器投退历史")
    public CommonResult<List<PowerCapacitorHisDTO>> getPowerCapacitorHisList(@RequestParam Map<String, Object> params) {
        List<PowerCapacitorHisEntity> list = powerCapacitorHisService.list(params);
        String statusId = (String) params.get("statusId");
        if (StringUtils.isBlank(statusId)) {
            return success(new ArrayList<>());
        }

        List<PowerCapacitorDetEntity> detList = powerCapacitorDetService.list(statusId);
        List<String> detIds = detList.stream().map(PowerCapacitorDetEntity::getId).collect(Collectors.toList());
        List<PowerCapacitorHisEntity> list = powerCapacitorHisService.list(detIds);
        return success(ConvertUtils.sourceToTarget(list, PowerCapacitorHisDTO.class));
    }


 ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/PowerCapacitorDetService.java

@@ -13,4 +13,6 @@
public interface PowerCapacitorDetService {

    List<PowerCapacitorDetEntity> list(Map<String, Object> params);

    List<PowerCapacitorDetEntity> list(String statusId);
}

 ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/PowerCapacitorHisService.java

@@ -14,5 +14,7 @@

    List<PowerCapacitorHisEntity> list(Map<String, Object> params);

    List<PowerCapacitorHisEntity> list(List<String> detIds);

    void add(String detId, String name, Integer status);
}

 ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/impl/PowerCapacitorDetServiceImpl.java

@@ -32,4 +32,12 @@
                .orderByAsc("sort");
        return powerCapacitorDetDao.selectList(queryWrapper);
    }

    @Override
    public List<PowerCapacitorDetEntity> list(String statusId) {
        QueryWrapper<PowerCapacitorDetEntity> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("status_id", statusId)
                .orderByAsc("sort");
        return powerCapacitorDetDao.selectList(queryWrapper);
    }
}

 ansteel-biz/src/main/java/com/iailab/module/ansteel/power/service/impl/PowerCapacitorHisServiceImpl.java

@@ -7,12 +7,10 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.*;

/**
 * @author PanZhibao
@@ -36,6 +34,17 @@
    }

    @Override
    public List<PowerCapacitorHisEntity> list(List<String> detIds) {
        if (CollectionUtils.isEmpty(detIds)) {
            return new ArrayList<PowerCapacitorHisEntity>();
        }
        QueryWrapper<PowerCapacitorHisEntity> queryWrapper = new QueryWrapper<>();
        queryWrapper.in("det_id", detIds)
                .orderByDesc("create_date");
        return powerCapacitorHisDao.selectList(queryWrapper);
    }

    @Override
    public void add(String detId, String name, Integer status) {
        PowerCapacitorHisEntity entity = new PowerCapacitorHisEntity();
        entity.setId(UUID.randomUUID().toString());

 doc/鞍钢数据接口文档_master.doc

Binary files differ