解决冲突

MrShi

2026-04-02 a29e0df3c165dfe2ddd825bb340ed480a64865db

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceCloudController.java

@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
 * @author 江蹄蹄
 * @date 2023/11/30 15:33
@@ -36,6 +37,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:device:create")
    public ApiResponse create(@RequestBody Device device,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        device.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(deviceService.create(device));
    }

@@ -43,18 +45,47 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:device:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        deviceService.deleteById(id);
        deviceService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }
    @ApiOperation("修改是否门禁入口")
    @PostMapping("/updateEntranceById")
    @CloudRequiredPermission("business:company:update")
    @CloudRequiredPermission("business:device:update")
    public ApiResponse updateStatusById(@RequestBody Device param,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        Device d = new Device();
        d.setId(param.getId());
        d.setEditDate(new Date());
        d.setIsEntrance(Constants.formatIntegerNum(param.getIsEntrance()));
        d.setLoginUserInfo(this.getLoginUser(token));
        deviceService.updateById(d);
        return ApiResponse.success(null);
    }
    @ApiOperation("修改是否系统使用")
    @PostMapping("/updateUsedById")
    @CloudRequiredPermission("business:device:update")
    public ApiResponse updateUsedById(@RequestBody Device param,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        Device d = new Device();
        d.setId(param.getId());
        d.setEditDate(new Date());
        d.setLoginUserInfo(this.getLoginUser(token));
        d.setIsUsed(Constants.formatIntegerNum(param.getIsUsed()));
        deviceService.updateUsedById(d);
        return ApiResponse.success(null);
    }
    @ApiOperation("执行电表开关闸操作")
    @PostMapping("/dianbaoCmd")
    @CloudRequiredPermission("business:device:update")
    public ApiResponse dianbaoCmd(@RequestBody Device param,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        param.setLoginUserInfo(this.getLoginUser(token));
        deviceService.dianbaoCmd(param);
        return ApiResponse.success(null);
    }
    @ApiOperation("读取电表数据（电能、时间和状态）")
    @PostMapping("/dianbiaoData")
    @CloudRequiredPermission("business:device:update")
    public ApiResponse dianbiaoData(@RequestBody Device param,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        param.setLoginUserInfo(this.getLoginUser(token));
        deviceService.dianbiaoData(param);
        return ApiResponse.success(null);
    }

@@ -67,7 +98,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        deviceService.deleteByIdInBatch(idList);
        deviceService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -75,6 +106,8 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:device:update")
    public ApiResponse updateById(@RequestBody Device device,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){

        device.setLoginUserInfo(this.getLoginUser(token));
        deviceService.updateById(device);
        return ApiResponse.success(null);
    }
@@ -85,6 +118,12 @@
    public ApiResponse<PageData<Device>> findPage (@RequestBody PageWrap<Device> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(deviceService.findPage(pageWrap));
    }
    @ApiOperation("查询全部")
    @PostMapping("/list")
    @CloudRequiredPermission("business:device:query")
    public ApiResponse<List<Device>> findPage (@RequestBody   Device model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(deviceService.findList(model));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")