配置工具修改

唐耀东

2021-12-31 9b3d5e47568ac430a7a544297cfa7d1a77186e86

配置工具修改

 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;

    /**
     * 基础信息
     */
@@ -70,6 +70,8 @@
        List<SysDictData> dict7 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT107"));
        // 外设单元
        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);

 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/DevEquipmentBo.java

@@ -120,5 +120,9 @@
     */
    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
    private String isAsc;

    /**
     * 是否注册
     */
    @ApiModelProperty(value = "register")
    private boolean register;
}

 ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java

@@ -129,6 +129,7 @@
        }
        // 设备不存在则新建
        else {
            if(bo.isRegister()) {
            // 先根据序列码生成序列号
            DevEquipmentCode c = new DevEquipmentCode();
            c.setCreateTime(DateUtils.getNowDate());
@@ -138,6 +139,9 @@
            add.setSerialNumber(c.getId());
            baseMapper.insert(add);
            return add;
            }else{
                return po;
            }
        }
    }