Merge remote-tracking branch 'origin/master'

zss

2024-07-26 8d3c3fec23edeabe3b40aa1eefc7fdd0c6c57d57

 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java

@@ -8,11 +8,11 @@
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.DataConfigDto;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.pojo.DataConfig;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.DataConfigService;
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.utils.DataAcquisition;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
@@ -177,11 +177,13 @@
    @ValueAuth
    @ApiOperation(value = "判断该设备是否可以数采")
    @GetMapping("/determineWhetherToCollectData")
    public Result<?> determineWhetherToCollectData(@RequestParam("managementNumber") String managementNumber) {
    public Result<?> determineWhetherToCollectData(@RequestParam("managementNumber") String managementNumber, HttpServletRequest request) {
        String ip = DataAcquisition.getIp(request);
        Device device = deviceService.getOne(Wrappers.<Device>lambdaQuery()
                .eq(Device::getManagementNumber, managementNumber));
                .eq(Device::getManagementNumber, managementNumber)
                .eq(Device::getIp, ip));
        if (ObjectUtils.isEmpty(device)) {
            return Result.fail("设备编号错误！");
            return Result.success(false);
        }
        if (ObjectUtils.isEmpty(device.getFileType()) || ObjectUtils.isEmpty(device.getCollectUrl())) {
            return Result.success(false);
@@ -195,17 +197,14 @@
    @PostMapping("/saveDataAcquisitionConfiguration")
    public Result<?> saveDataAcquisitionConfiguration(@RequestParam(value = "deviceId") Integer deviceId, @RequestBody DataConfigDto dataConfigList) {
        if (dataConfigList.getIsDevice()) {
            Device one = deviceService.getOne(Wrappers.<Device>lambdaQuery()
                    .eq(Device::getIp, dataConfigList.getIp()));
            if (ObjectUtils.isNotEmpty(one)) {
                throw new ErrorException("该IP：" + dataConfigList.getIp() + "已经绑定了设备：" + one.getDeviceName());
            }
            Device device = new Device();
            device.setId(deviceId);
            device.setCollectUrl(dataConfigList.getCollectUrl());
            device.setStorageUrl(dataConfigList.getStorageUrl());
            device.setIp(dataConfigList.getIp());
            device.setFileType(dataConfigList.getFileType());
            device.setMdbEntrustCode(dataConfigList.getMdbEntrustCode());
            device.setMdbSampleCode(dataConfigList.getMdbSampleCode());
            deviceService.updateById(device);
        } else {
            dataConfigService.saveOrUpdateBatch(dataConfigList.getDataConfigList());
@@ -250,5 +249,12 @@
        dataConfigService.removeBatchByIds(collect);
        return Result.success();
    }

    @ValueAuth
    @ApiOperation(value = "菜单")
    @PostMapping("/menu")
    public Result menu() {
        return Result.success(deviceService.menu());
    }
}