screen-api 增加根据组织id获取型号接口

kaiyu

2021-06-18 643bde4fc2446be7b059a03d20a66781953bb9a7

screen-api
                    增加根据组织id获取型号接口

 screen-manage/src/main/java/com/moral/api/controller/VersionController.java

@@ -121,4 +121,14 @@
        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
    }

    @GetMapping("queryByOrgId")
    public ResultMessage queryByOrganizationId(Integer organizationId){

        VersionQueryDTO dto = versionService.queryByOrganizationId(organizationId);

        VersionQueryVO vo = VersionQueryVO.convert(dto);

        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
    }

}

 screen-manage/src/main/java/com/moral/api/pojo/dto/organizationUnitAlarm/OrganizationUnitAlarmDTO.java

File was deleted

 screen-manage/src/main/java/com/moral/api/pojo/form/organizationUnitAlarm/OrganizationUnitAlarmInsertForm.java

File was deleted

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

@@ -2,8 +2,6 @@

import com.moral.api.entity.OrganizationUnitAlarm;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.dto.organizationUnitAlarm.OrganizationUnitAlarmDTO;
import com.moral.api.pojo.form.organizationUnitAlarm.OrganizationUnitAlarmInsertForm;

/**
 * <p>
@@ -15,12 +13,4 @@
 */
public interface OrganizationUnitAlarmService extends IService<OrganizationUnitAlarm> {

    /**
    * @Description: 分配组织显示单位以及报警等级
            * @Param: [organizationInsertForm]
            * @return: com.moral.api.pojo.dto.organizationUnitAlarm.OrganizationUnitAlarmDTO
            * @Author: 陈凯裕
            * @Date: 2021/6/17
            */
    OrganizationUnitAlarmDTO insertOrganizationUnitAlarm(OrganizationUnitAlarmInsertForm organizationInsertForm);
}

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

@@ -71,4 +71,13 @@
            */
    VersionQueryDTO queryVersionById(VersionQueryByIdForm form);

    /**
    * @Description: 根据组织id查询型号
            * @Param: [organizationId]
            * @return: com.moral.api.pojo.dto.version.VersionQueryDTO
            * @Author: 陈凯裕
            * @Date: 2021/6/18
            */
    VersionQueryDTO queryByOrganizationId(Integer organizationId);

}

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

@@ -2,8 +2,6 @@

import com.moral.api.entity.OrganizationUnitAlarm;
import com.moral.api.mapper.OrganizationUnitAlarmMapper;
import com.moral.api.pojo.dto.organizationUnitAlarm.OrganizationUnitAlarmDTO;
import com.moral.api.pojo.form.organizationUnitAlarm.OrganizationUnitAlarmInsertForm;
import com.moral.api.service.OrganizationUnitAlarmService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@@ -19,9 +17,4 @@
@Service
public class OrganizationUnitAlarmServiceImpl extends ServiceImpl<OrganizationUnitAlarmMapper, OrganizationUnitAlarm> implements OrganizationUnitAlarmService {

    @Override
    public OrganizationUnitAlarmDTO insertOrganizationUnitAlarm(OrganizationUnitAlarmInsertForm organizationInsertForm) {

        return null;
    }
}

 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) {
@@ -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;
    }


}