fix 客户列表bug修复

zhanzhiqin

2022-04-25 35b68d05c92ae1eab2e409529a070a217ba492ae

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java

@@ -11,6 +11,7 @@
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.dto.LightTaskDto;
import com.sandu.ximon.admin.dto.SingleLightOrderDto;
@@ -56,6 +57,7 @@

    private final PoleService poleService;
    private final LightTaskPoleRelationService lightTaskPoleRelationService;
    private final LightTaskMapper lightTaskMapper;

    /**
     * 新增路灯任务
@@ -156,7 +158,7 @@
        return Optional.ofNullable(responseCommonFrame).map(WrapResponseCommonFrame::getResponseInnerFrame).orElse(null);
    }

    public List<LightTaskDto> listLightTask(int pageNo, int pageSize, String keyword) {
    public List<LightTaskDto> listLightTask(BaseConditionVO conditionVO, String keyword) {
        LambdaQueryWrapper<LightTask> wrapper = Wrappers.lambdaQuery(LightTask.class);
        if (StrUtil.isNotBlank(keyword)) {
            wrapper.like(LightTask::getTaskName, keyword);
@@ -168,7 +170,9 @@
            });
        }

        PageHelper.startPage(pageNo, pageSize);
        if (conditionVO != null) {
            PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize());
        }
        List<LightTask> list = list(wrapper);

        Page<LightTaskDto> page = new Page<>();
@@ -182,6 +186,26 @@
        return page;
    }

    /**
     * 执行中的路灯任务
     *
     * @return
     */
    public List<LightTaskDto> listTask() {
        Long clientId = SecurityUtils.getClientId();
        List<LightTask> lightTasks = lightTaskMapper.listLightTask(clientId);
        Page<LightTaskDto> page = new Page<>();
        BeanUtils.copyProperties(lightTasks, page);
        for (LightTask lightTask : lightTasks) {
            LightTaskDto lightTaskDto = new LightTaskDto();
            BeanUtils.copyProperties(lightTask, lightTaskDto);
            lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));
            page.add(lightTaskDto);
        }
        return page;
    }


    // 每个路灯发送控制帧 返回关联列表
    private List<LightTaskPoleRelation> sendControllerFrame(LightTask lightTask, List<Long> poleIdList, String framePayload) {
        List<LightTaskPoleRelation> lightTaskPoleRelationList = new ArrayList<>();