blame | history | patch | commit | commitdiff | ignore whitespace
kaiyu
2021-06-22 f3419b47ff0b253a9ed1e0dbff4d27fd31876f3f 
 screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java


@@ -4,10 +4,8 @@


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.entity.*;


import com.moral.api.mapper.OrganizationUnitAlarmMapper;


import com.moral.api.mapper.SensorMapper;


import com.moral.api.mapper.VersionMapper;


import com.moral.api.mapper.VersionSensorUnitMapper;


@@ -44,6 +42,8 @@


    VersionSensorUnitMapper versionSensorUnitMapper;


    @Autowired


    SensorMapper sensorMapper;


    @Autowired


    OrganizationUnitAlarmMapper organizationUnitAlarmMapper;




    @Override


    public VersionQueryDTO query(VersionQueryForm form) {


@@ -198,7 +198,7 @@


        versionSensorUnitMapper.update(null, deleteWrapper);


        //将前端传来的id转为code


        for (VersionSensorUnit sensorUnit : sensorUnits) {


            Sensor sensor = sensorMapper.selectById(sensorUnit.getId());


            Sensor sensor = sensorMapper.selectById(sensorUnit.getSensorId());


            sensorUnit.setSensorCode(sensor.getCode());


        }


        //添加新分配的单位和因子


@@ -260,5 +260,30 @@


        return dto;


    }




    @Override


    public VersionQueryDTO queryByOrganizationId(Integer organizationId) {


        //创建返回对象


        VersionQueryDTO dto = new VersionQueryDTO();


        //查询型号id


        QueryWrapper<OrganizationUnitAlarm> queryVersionIdsWrapper = new QueryWrapper<>();


        queryVersionIdsWrapper.select("DISTINCT version_id").eq("is_delete",Constants.NOT_DELETE).eq("organization_id",organizationId);


        List<OrganizationUnitAlarm> organizationUnitAlarms = organizationUnitAlarmMapper.selectList(queryVersionIdsWrapper);


        List<Integer> versionIds = new ArrayList<>();


        for (OrganizationUnitAlarm organizationUnitAlarm : organizationUnitAlarms) {


            versionIds.add(organizationUnitAlarm.getVersionId());


        }


        //根据型号id查询型号


        List<Version> versions = new ArrayList<>();


        if(!ObjectUtils.isEmpty(versionIds))


            versions = versionMapper.selectBatchIds(versionIds);


        //封装返回对象


        List<VersionDTO> versionDTOS = new ArrayList<>();


        versions.forEach(value->versionDTOS.add(new VersionDTO(value)));


        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());


        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());


        dto.setVersionDTOS(versionDTOS);


        return dto;


    }






}