screen-api 修改增加型号bug

kaiyu

2021-06-18 a8dc519f52dac392047e8d07c6b0aa4616e6eedd

 screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java

@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.config.mybatis.wrapper.NullFilterWrapper;
import com.moral.api.entity.Sensor;
import com.moral.api.entity.User;
import com.moral.api.entity.Version;
import com.moral.api.entity.VersionSensorUnit;
import com.moral.api.mapper.SensorMapper;
import com.moral.api.mapper.VersionMapper;
import com.moral.api.mapper.VersionSensorUnitMapper;
import com.moral.api.pojo.dto.version.VersionDTO;
@@ -40,6 +42,8 @@
    VersionMapper versionMapper;
    @Autowired
    VersionSensorUnitMapper versionSensorUnitMapper;
    @Autowired
    SensorMapper sensorMapper;

    @Override
    public VersionQueryDTO query(VersionQueryForm form) {
@@ -141,7 +145,7 @@
        QueryWrapper<Version> wrapper = new QueryWrapper<>();
        wrapper.setEntity(existVersion);
        Version existVersionResult = versionMapper.selectOne(wrapper);
        if(!ObjectUtils.isEmpty(existVersionResult)){
        if (!ObjectUtils.isEmpty(existVersionResult)) {
            dto.setCode(ResponseCodeEnum.VERSION_EXIST.getCode());
            dto.setMsg(ResponseCodeEnum.VERSION_EXIST.getMsg());
            return dto;
@@ -170,9 +174,9 @@
        versionMapper.updateById(deleteVersion);
        //删除型号和因子单位对应表
        UpdateWrapper deleteSensorUnitWrapper = new UpdateWrapper();
        deleteSensorUnitWrapper.eq("version_id",id);
        deleteSensorUnitWrapper.set("is_delete",Constants.DELETE);
        versionSensorUnitMapper.update(null,deleteSensorUnitWrapper);
        deleteSensorUnitWrapper.eq("version_id", id);
        deleteSensorUnitWrapper.set("is_delete", Constants.DELETE);
        versionSensorUnitMapper.update(null, deleteSensorUnitWrapper);
        //封装返回结果
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -180,7 +184,81 @@
    }

    @Override
    @Transactional
    public VersionDTO updateSensorUnits(VersionSensorUnitForm form) {
        return null;
        //创建返回对象
        VersionDTO dto = new VersionDTO();
        //取参
        List<VersionSensorUnit> sensorUnits = form.getSensorUnits();
        Integer versionId = form.getVersionId();
        //删除之前分配的单位和因子
        UpdateWrapper deleteWrapper = new UpdateWrapper();
        deleteWrapper.eq("version_id", versionId);
        deleteWrapper.set("is_delete", Constants.DELETE);
        versionSensorUnitMapper.update(null, deleteWrapper);
        //将前端传来的id转为code
        for (VersionSensorUnit sensorUnit : sensorUnits) {
            Sensor sensor = sensorMapper.selectById(sensorUnit.getSensorId());
            sensorUnit.setSensorCode(sensor.getCode());
        }
        //添加新分配的单位和因子
        for (VersionSensorUnit sensorUnit : sensorUnits) {
            sensorUnit.setVersionId(versionId);
            versionSensorUnitMapper.insert(sensorUnit);
        }
        //封装返回结果
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        return dto;
    }

    @Override
    public VersionQueryDTO queryVersionById(VersionQueryByIdForm form) {
        //创建返回对象
        VersionQueryDTO dto = new VersionQueryDTO();
        //取参
        Integer id = form.getId();
        Integer size = form.getSize();
        Integer page = form.getPage();
        //查询版本对应的因子和单位
        List<Integer> versionsIds = new ArrayList<>();
        versionsIds.add(id);
        List<Version> versions = new ArrayList<>();
        versions = versionMapper.queryVersionsAndSensorUnitByIds(versionsIds);
        //根据分页信息进行选择因子
        Version version = versions.get(0);
        List<Sensor> querySensors = version.getSensors();
        if (!ObjectUtils.isEmpty(querySensors)) {
            int startIndex = (page - 1) * size;
            int endIndex = startIndex + size - 1;
            List<Sensor> resultSensors = new ArrayList<>();

            for (int i = startIndex; i <= endIndex; i++) {
                if (i >= querySensors.size())
                    break;
                resultSensors.add(querySensors.get(i));
            }
            version.setSensors(resultSensors);
        }
        //封装返回对象
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        if (ObjectUtils.isEmpty(querySensors)) {
            dto.setTotal(0);
            dto.setPages(0);
        }else{
            dto.setTotal(querySensors.size());
            double querySize = (double)querySensors.size();
            double dSize = (double)size;
            dto.setPages((int)Math.ceil(querySize/dSize));
        }
        dto.setSize(size);
        dto.setCurrent(page);
        VersionDTO versionDTO = new VersionDTO();
        versionDTO.setVersion(version);
        dto.setVersionDTOS(Arrays.asList(versionDTO));
        return dto;
    }


}