|
|
@ -2,7 +2,9 @@ package com.ruoyi.code.camera.controller; |
|
|
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.ruoyi.code.camera.domain.Camera; |
|
|
|
import com.ruoyi.code.camera.domain.Camera; |
|
|
|
|
|
|
|
import com.ruoyi.code.camera.domain.CameraNetFtp; |
|
|
|
import com.ruoyi.code.camera.domain.LogInfo; |
|
|
|
import com.ruoyi.code.camera.domain.LogInfo; |
|
|
|
|
|
|
|
import com.ruoyi.code.camera.service.ICameraNetFtpService; |
|
|
|
import com.ruoyi.code.camera.service.ICameraService; |
|
|
|
import com.ruoyi.code.camera.service.ICameraService; |
|
|
|
import com.ruoyi.common.annotation.Log; |
|
|
|
import com.ruoyi.common.annotation.Log; |
|
|
|
import com.ruoyi.common.core.controller.BaseController; |
|
|
|
import com.ruoyi.common.core.controller.BaseController; |
|
|
@ -36,6 +38,8 @@ public class ApiController extends BaseController |
|
|
|
{ |
|
|
|
{ |
|
|
|
@Resource |
|
|
|
@Resource |
|
|
|
private ICameraService cameraService; |
|
|
|
private ICameraService cameraService; |
|
|
|
|
|
|
|
@Resource |
|
|
|
|
|
|
|
private ICameraNetFtpService cameraNetFtpService; |
|
|
|
|
|
|
|
|
|
|
|
@RequestMapping("/camera/heart") |
|
|
|
@RequestMapping("/camera/heart") |
|
|
|
public R heart(@RequestParam Map<String, Object> params){ |
|
|
|
public R heart(@RequestParam Map<String, Object> params){ |
|
|
@ -187,4 +191,24 @@ public class ApiController extends BaseController |
|
|
|
CameraUtil.setNowTime(new NativeLong(Long.parseLong(camera.getLoginId()))); |
|
|
|
CameraUtil.setNowTime(new NativeLong(Long.parseLong(camera.getLoginId()))); |
|
|
|
return R.ok(); |
|
|
|
return R.ok(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@RequestMapping("/getNetCfg") |
|
|
|
|
|
|
|
public R getNetCfg(Long cameraId){ |
|
|
|
|
|
|
|
Camera camera = cameraService.getById(cameraId); |
|
|
|
|
|
|
|
if(camera.getStatus() == 0){ |
|
|
|
|
|
|
|
return R.error("设备未在线"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
CameraNetFtp cfg = cameraNetFtpService.getNetCfg(camera); |
|
|
|
|
|
|
|
return R.ok().put("data",cfg); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@RequestMapping("/editNetCfg") |
|
|
|
|
|
|
|
public R editNetCfg(@RequestBody CameraNetFtp cameraNetFtp){ |
|
|
|
|
|
|
|
Camera camera = cameraService.getOne(new QueryWrapper<Camera>().eq("devsn",cameraNetFtp.getDevsn()).eq("status","1")); |
|
|
|
|
|
|
|
if(camera == null){ |
|
|
|
|
|
|
|
return R.error("设备未在线"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
cameraNetFtp.setLoginId(camera.getLoginId()); |
|
|
|
|
|
|
|
return cameraNetFtpService.editNetCfg(cameraNetFtp); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|