问题修改

唐耀东

2022-02-18 ce34d9d0ac101f816a0fc7f798607adfe44d7885

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

@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.common;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.annotation.DataDictClass;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -10,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;
@@ -51,30 +50,28 @@

    private final IDevEquipmentService iDevEquipmentService;

    private final IDevManufacturerService iDevManufacturerService;

    /**
     * 基础信息
     */
    @ApiOperation("基础信息")
    @Log(type = LogType.EQUIPMENT_LOG, operation = EquipmentLog.LOAD)
    @GetMapping
    public AjaxResult externalAdd() {
    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> dict4 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT104"));
        // 办学层次
        List<SysDictData> dict5 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT105"));
        // 学科范围
        List<SysDictData> dict6 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT106"));
        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>());
        // 高校
@@ -83,35 +80,46 @@
        map.put("DICT101", dict1);
        map.put("DICT102", dict2);
        map.put("DICT103", dict3);
        map.put("DICT104", dict4);
        map.put("DICT105", dict5);
        map.put("DICT106", dict6);
        map.put("DICT107", dict7);
        map.put("peripheralUnit", peripheralUnit);
        map.put("peripheralFirm", peripheralFirm);
        map.put("batch", batch);
        map.put("school", school);
        return AjaxResult.success(map);
    }

    /**
     * 新增智控设备
     * 设备校验
     */
    @ApiOperation("新增智控设备")
    @Log(type = LogType.EQUIPMENT_LOG, operation = EquipmentLog.WRITE)
    @ApiOperation("设备校验")
    @Log(type = LogType.EQUIPMENT_LOG, operation = EquipmentLog.CHECK)
    @RepeatSubmit()
    @PostMapping("/equipment")
    @DataDictClass
    public AjaxResult equipmentAdd(@Validated(AddGroup.class) @RequestBody DevEquipmentBo bo) {
        return AjaxResult.success(iDevEquipmentService.externalAdd(bo));
    }

    /**
     * 编辑智控设备
     * 设备写入参数
     */
    @ApiOperation("新增智控设备（外部调用-去掉权限）")
    @ApiOperation("设备写入参数")
    @RepeatSubmit()
    @Log(type = LogType.EQUIPMENT_LOG, operation = EquipmentLog.SUBMIT_COMMENT)
    @PutMapping("/equipment")
    @Log(type = LogType.EQUIPMENT_LOG, operation = EquipmentLog.WRITE)
    @PostMapping("/edit")
    public AjaxResult equipmentEdit(@Validated(AddGroup.class) @RequestBody DevEquipmentBo bo) {
        return AjaxResult.success(iDevEquipmentService.equipmentEdit(bo));
    }

    /**
     * 提交备注
     */
    @ApiOperation("提交备注")
    @RepeatSubmit()
    @Log(type = LogType.EQUIPMENT_LOG, operation = EquipmentLog.SUBMIT_COMMENT)
    @PostMapping("/submitComment")
    public AjaxResult submitComment(@Validated(AddGroup.class) @RequestBody DevEquipmentBo bo) {
        iDevEquipmentService.submitComment(bo);
        return AjaxResult.success();
    }
}