分离平台和摄像机控制程序

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")

ruoyi-api/src/main/java/com/ruoyi/api/mapper/DapingMapper.java

@@ -35,7 +35,7 @@ public interface DapingMapper extends BaseMapper<WaterPhotoInfo> {
      * 查询id
      * @return
      */
-    List<Map<String,Object>> selectStationInfoId();
+    List<Map<String,Object>> selectStationInfoId(@Param("ids") String ids);
 
     /**
      * 在线

ruoyi-api/src/main/java/com/ruoyi/api/service/DapingService.java

@@ -22,7 +22,7 @@ public interface DapingService extends IService<WaterPhotoInfo> {
      * 水位趋势
      * @return
      */
-    R getWaterLevelTrend();
+    R getWaterLevelTrend(String ids);
 
     /**
      * 查询状态

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<DapingMapper, WaterPhotoInfo>
      * @return
      */
     @Override
-    public R getWaterLevelTrend() {
+    public R getWaterLevelTrend(String ids) {
         Map<String, Object> map = new HashMap<>();
         Map<String, Object> valMap;
         List<String> valueList;
         List<String> tmList = new ArrayList<>();
         List<String> stnmList = new ArrayList<>();
         List<Map<String, Object>> valuesList = new ArrayList<>();
-        List<Map<String,Object>> stList = baseMapper.selectStationInfoId();
+        List<Map<String,Object>> stList = baseMapper.selectStationInfoId(ids);
         for (Map<String,Object> m : stList) {
             List<WaterPhotoInfo> waterPhotoInfos = baseMapper.selectWaterLevelTrend(Integer.parseInt(m.get("id").toString()));
             if (waterPhotoInfos.size()==0){

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 @@
     </select>
     <select id="selectStationInfoId" resultType="java.util.Map">
         select id,stnm from sc_station_info
+        <where>
+            <if test="ids != null and ids != ''">
+                id in (${ids})
+            </if>
+        </where>
+        <if test="ids == null or ids == ''">
+            limit 5
+        </if>
     </select>
     <select id="selectStationByOnlineStatus" resultType="java.util.Map">
-        select count(1) as value , '在线' as name from camera where status = '1';
+        select count(1) as value , '在线' as name from camera where status = '1' and first_time is not null
     </select>
     <select id="selectStationByOfflineStatus" resultType="java.util.Map">
-        select count(1) as value , '不在线' as name from camera where status = '2';
+        select count(1) as value , '不在线' as name from camera where status = '0' and first_time is not null
     </select>
 </mapper>

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<String, Object> 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<Camera>().eq("devsn",cameraNetFtp.getDevsn()).eq("status","1"));
+        if(camera == null){
+            return R.error("设备未在线");
+        }
+        cameraNetFtp.setLoginId(camera.getLoginId());
+        return cameraNetFtpService.editNetCfg(cameraNetFtp);
+    }
 }

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;
 }