提交代码

唐耀东

2022-05-12 b78f403d9237c2bbddbc9be505acfd068a0521aa

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java

@@ -11,12 +11,10 @@
import com.ruoyi.common.enums.LogType;
import com.ruoyi.oa.domain.BsSchool;
import com.ruoyi.oa.domain.DevBatch;
import com.ruoyi.oa.domain.DevManufacturer;
import com.ruoyi.oa.domain.DevPeripheralUnit;
import com.ruoyi.oa.domain.bo.DevEquipmentBo;
import com.ruoyi.oa.service.IBsSchoolService;
import com.ruoyi.oa.service.IDevBatchService;
import com.ruoyi.oa.service.IDevEquipmentService;
import com.ruoyi.oa.service.IDevPeripheralUnitService;
import com.ruoyi.oa.service.*;
import com.ruoyi.system.service.ISysDictDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -52,6 +50,8 @@

    private final IDevEquipmentService iDevEquipmentService;

    private final IDevManufacturerService iDevManufacturerService;

    /**
     * 基础信息
     */
@@ -61,15 +61,17 @@
    public AjaxResult externaList() {

        // 智控设备类型
        List<SysDictData> dict1 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT101"));
        List<SysDictData> dict1 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT101").orderByAsc(SysDictData::getDictSort));
        // β网络工作频段
        List<SysDictData> dict2 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT102"));
        List<SysDictData> dict2 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT102").orderByAsc(SysDictData::getDictSort));
        // 串口通信波特率
        List<SysDictData> dict3 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT103"));
        List<SysDictData> dict3 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT103").orderByAsc(SysDictData::getDictSort));
        // 采集周期
        List<SysDictData> dict7 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT107"));
        List<SysDictData> dict7 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT107").orderByAsc(SysDictData::getDictSort));
        // 外设单元
        List<DevPeripheralUnit> peripheralUnit = iDevPeripheralUnitService.list(new QueryWrapper<DevPeripheralUnit>());
        //外设厂商
        List<DevManufacturer> peripheralFirm = iDevManufacturerService.list(new QueryWrapper<DevManufacturer>());
        // 批次
        List<DevBatch> batch = iDevBatchService.list(new QueryWrapper<DevBatch>());
        // 高校
@@ -80,6 +82,7 @@
        map.put("DICT103", dict3);
        map.put("DICT107", dict7);
        map.put("peripheralUnit", peripheralUnit);
        map.put("peripheralFirm", peripheralFirm);
        map.put("batch", batch);
        map.put("school", school);
        return AjaxResult.success(map);