雪花算法重复id优化+关掉异步进程+优化加班工时生成条件

zss

2024-07-26 d7458cb8e91c48375a54d4ccdb84a7e0b4e06534

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

@@ -13,6 +13,7 @@
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 +178,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);
@@ -250,5 +253,12 @@
        dataConfigService.removeBatchByIds(collect);
        return Result.success();
    }

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