kaiyu
2021-05-20 89d69ac261923790e2d46b9bf3748a6cf2f2767b
screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
@@ -8,11 +8,13 @@
import com.moral.api.entity.VersionSensorUnit;
import com.moral.api.mapper.VersionMapper;
import com.moral.api.mapper.VersionSensorUnitMapper;
import com.moral.api.pojo.dto.version.VersionDTO;
import com.moral.api.pojo.dto.version.VersionQueryDTO;
import com.moral.api.pojo.form.version.VersionQueryForm;
import com.moral.api.service.VersionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.ConvertUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -55,7 +57,7 @@
        //组装查询条件
        Page<Version> queryPage = new Page<>(page, size);
        NullFilterWrapper<Version> wrapper = new NullFilterWrapper<>();
        wrapper.like("name",name);
        wrapper.like("name", name);
        wrapper.between("create_time", createStartTime, createEndTime);
        wrapper.between("update_time", updateStartTime, updateEndTime);
        //排序顺序条件构造
@@ -66,16 +68,25 @@
                wrapper.orderByDesc(ConvertUtils.toLine(order));
        }
        //查询结果
        Page<Version> versionsPage = versionMapper.selectPage(queryPage,wrapper);
        Page<Version> versionsPage = versionMapper.selectPage(queryPage, wrapper);
        List<Version> versions = versionsPage.getRecords();
        //查询版本对应的因子和单位
        List<Integer> versionsIds = new ArrayList<>();
        versions.forEach(value->versionsIds.add(value.getId()));
        if(!ObjectUtils.isEmpty(versionsIds)){
            QueryWrapper<VersionSensorUnit> sensorUnitQueryWrapper = new QueryWrapper<>();
        versions.forEach(value -> versionsIds.add(value.getId()));
        List<Version> result = new ArrayList<>();
        if (!ObjectUtils.isEmpty(versionsIds)) {
            result = versionMapper.queryVersionsAndSensorUnitByIds(versionsIds);
        }
        return null;
        //封装返回数据
        List<VersionDTO> dtos = new ArrayList<>();
        result.forEach(value -> dtos.add(new VersionDTO(value)));
        dto.setVersionDTOS(dtos);
        dto.setCurrent(versionsPage.getCurrent());
        dto.setPages(versionsPage.getPages());
        dto.setSize(versionsPage.getSize());
        dto.setTotal(versionsPage.getTotal());
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        return dto;
    }
}