From 3579e66a56858f35c7dae5c87b1ff403118b9239 Mon Sep 17 00:00:00 2001 From: 4670101279 Date: Mon, 1 Aug 2022 09:30:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=A6=BB=E5=B9=B3=E5=8F=B0=E5=92=8C?= =?UTF-8?q?=E6=91=84=E5=83=8F=E6=9C=BA=E6=8E=A7=E5=88=B6=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/api/app/DapingController.java | 4 ++-- .../com/ruoyi/api/mapper/DapingMapper.java | 2 +- .../com/ruoyi/api/service/DapingService.java | 2 +- .../api/service/impl/DapingServiceImpl.java | 5 ++-- .../resources/mapper/api/DapingMapper.xml | 13 ++++++++-- .../code/camera/controller/ApiController.java | 24 +++++++++++++++++++ .../com/ruoyi/code/camera/domain/Camera.java | 1 + 7 files changed, 43 insertions(+), 8 deletions(-) diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/app/DapingController.java b/ruoyi-api/src/main/java/com/ruoyi/api/app/DapingController.java index d6afa3d..b6655ed 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/app/DapingController.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/app/DapingController.java @@ -32,8 +32,8 @@ public class DapingController { } @RequestMapping("/station/waterLevelTrend") - public R getWaterLevelTrend(){ - return dapingService.getWaterLevelTrend(); + public R getWaterLevelTrend(String ids){ + return dapingService.getWaterLevelTrend(ids); } @RequestMapping("/station/status") diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/mapper/DapingMapper.java b/ruoyi-api/src/main/java/com/ruoyi/api/mapper/DapingMapper.java index b2f28c7..f220685 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/mapper/DapingMapper.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/mapper/DapingMapper.java @@ -35,7 +35,7 @@ public interface DapingMapper extends BaseMapper { * 查询id * @return */ - List> selectStationInfoId(); + List> selectStationInfoId(@Param("ids") String ids); /** * 在线 diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/service/DapingService.java b/ruoyi-api/src/main/java/com/ruoyi/api/service/DapingService.java index 5011d01..a3a82c1 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/service/DapingService.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/service/DapingService.java @@ -22,7 +22,7 @@ public interface DapingService extends IService { * 水位趋势 * @return */ - R getWaterLevelTrend(); + R getWaterLevelTrend(String ids); /** * 查询状态 diff --git a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/DapingServiceImpl.java b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/DapingServiceImpl.java index 40454be..b3ba859 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/DapingServiceImpl.java +++ b/ruoyi-api/src/main/java/com/ruoyi/api/service/impl/DapingServiceImpl.java @@ -5,6 +5,7 @@ import com.ruoyi.api.mapper.DapingMapper; import com.ruoyi.api.service.DapingService; import com.ruoyi.code.camera.domain.WaterPhotoInfo; import com.ruoyi.common.core.page.R; +import com.ruoyi.common.utils.StringUtils; import org.springframework.stereotype.Service; import java.util.*; @@ -33,14 +34,14 @@ public class DapingServiceImpl extends ServiceImpl * @return */ @Override - public R getWaterLevelTrend() { + public R getWaterLevelTrend(String ids) { Map map = new HashMap<>(); Map valMap; List valueList; List tmList = new ArrayList<>(); List stnmList = new ArrayList<>(); List> valuesList = new ArrayList<>(); - List> stList = baseMapper.selectStationInfoId(); + List> stList = baseMapper.selectStationInfoId(ids); for (Map m : stList) { List waterPhotoInfos = baseMapper.selectWaterLevelTrend(Integer.parseInt(m.get("id").toString())); if (waterPhotoInfos.size()==0){ diff --git a/ruoyi-api/src/main/resources/mapper/api/DapingMapper.xml b/ruoyi-api/src/main/resources/mapper/api/DapingMapper.xml index 854db21..415ef13 100644 --- a/ruoyi-api/src/main/resources/mapper/api/DapingMapper.xml +++ b/ruoyi-api/src/main/resources/mapper/api/DapingMapper.xml @@ -22,6 +22,7 @@ s.id, s.stnm, s.camera_sn, + w.tm, w.value FROM sc_station_info s @@ -61,11 +62,19 @@ diff --git a/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/ApiController.java b/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/ApiController.java index de75430..7df994b 100644 --- a/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/ApiController.java +++ b/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/ApiController.java @@ -2,7 +2,9 @@ package com.ruoyi.code.camera.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.service.ICameraNetFtpService; import com.ruoyi.code.camera.service.ICameraService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; @@ -36,6 +38,8 @@ public class ApiController extends BaseController { @Resource private ICameraService cameraService; + @Resource + private ICameraNetFtpService cameraNetFtpService; @RequestMapping("/camera/heart") public R heart(@RequestParam Map params){ @@ -187,4 +191,24 @@ public class ApiController extends BaseController CameraUtil.setNowTime(new NativeLong(Long.parseLong(camera.getLoginId()))); 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().eq("devsn",cameraNetFtp.getDevsn()).eq("status","1")); + if(camera == null){ + return R.error("设备未在线"); + } + cameraNetFtp.setLoginId(camera.getLoginId()); + return cameraNetFtpService.editNetCfg(cameraNetFtp); + } } diff --git a/ruoyi-code/src/main/java/com/ruoyi/code/camera/domain/Camera.java b/ruoyi-code/src/main/java/com/ruoyi/code/camera/domain/Camera.java index 3250949..ea238cc 100644 --- a/ruoyi-code/src/main/java/com/ruoyi/code/camera/domain/Camera.java +++ b/ruoyi-code/src/main/java/com/ruoyi/code/camera/domain/Camera.java @@ -63,4 +63,5 @@ public class Camera implements Serializable @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; + private Long platformId; }