附近相机接口修改

zc-business/src/main/java/com/zc/business/controller/DcEventImportantFileController.java

@@ -162,4 +162,13 @@ public class DcEventImportantFileController extends BaseController
     {
         return toAjax(dcEventImportantFileService.deleteDcEventImportantFileByEventIds(ids));
     }
+
+    /**
+     * 获取重要事件状态
+     */
+    @ApiOperation("获取重要事件状态")
+    @GetMapping("/getImportantFileStatus/{eventId}")
+    public AjaxResult getImportantFileStatus(@PathVariable("eventId") String eventId){
+        return dcEventImportantFileService.getImportantFileStatus(eventId);
+    }
 }

zc-business/src/main/java/com/zc/business/controller/VideoController.java

@@ -401,7 +401,7 @@ public class VideoController extends BaseController {
     public Object nearCamPileNum(@ApiParam(value = "桩号", name = "pileNum", required = true) String pileNum) throws HttpException, IOException {
 
         // 获取济菏运管中心相机信息
-        JSONObject camInfo = getCamByDept("1301730");
+        /*JSONObject camInfo = getCamByDept("1301730");
 
         if (!camInfo.containsKey("data")) {
             return camInfo;
@@ -435,8 +435,17 @@ public class VideoController extends BaseController {
                 .filter(item -> "1".equals(item.get("camOrientation")) && Integer.parseInt(item.get("distance").toString()) < 2000)
                 .sorted(comparing(item -> Integer.parseInt(item.get("distance").toString())))
                 .collect(Collectors.toList());
-        result.put("downCamera",downCameraList);
+        result.put("downCamera",downCameraList);*/
+
+        Map<String,Object> result = new HashMap<>();
 
+        Integer pileNumDistance = pileNumTransformMetre(pileNum);
+        String startMileage = String.valueOf(pileNumDistance - 2000);
+        String endMileage = String.valueOf(pileNumDistance + 2000);
+        List<DcDevice> upCameraList = iDcDeviceService.selectNearCamPile("1",startMileage,endMileage);
+        List<DcDevice> downCameraList = iDcDeviceService.selectNearCamPile("3",startMileage,endMileage);
+        result.put("upCamera",upCameraList);
+        result.put("downCamera",downCameraList);
 
         return AjaxResult.success(result);
     }

zc-business/src/main/java/com/zc/business/mapper/DcDeviceMapper.java

@@ -3,8 +3,10 @@ package com.zc.business.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zc.business.domain.DcDevice;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备Mapper接口
@@ -18,5 +20,5 @@ public interface DcDeviceMapper extends BaseMapper<DcDevice> {
     List<DcDevice> numberOfDevicesByType(DcDevice dcDevice);
     List<DcDevice> numberOfDevicesByType();
 
-
+    List<DcDevice> selectNearCamPile(@Param("direction") String direction,@Param("startMileage") String startMileage,@Param("endMileage") String endMileage);
 }

zc-business/src/main/java/com/zc/business/mapper/DcEventImportantFileMapper.java

@@ -1,6 +1,8 @@
 package com.zc.business.mapper;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.zc.business.domain.DcEventImportantFile;
 
 /**
@@ -58,4 +60,12 @@ public interface DcEventImportantFileMapper
      * @return 结果
      */
     int deleteDcEventImportantFileByEventIds(String[] ids);
+
+    /**
+     * 获取重要事件状态
+     *
+     * @param eventId 事件id
+     * @return 结果
+     */
+    int getImportantFileStatus(String eventId);
 }

zc-business/src/main/java/com/zc/business/service/IDcDeviceService.java

@@ -81,4 +81,6 @@ public interface IDcDeviceService extends IService<DcDevice> {
     List<DcDevice> numberOfDevicesByType(DcDevice dcDevice);
 
     List<DcDevice> numberOfDevicesByType();
+
+    List<DcDevice> selectNearCamPile(String direction,String startMileage,String endMileage);
 }

zc-business/src/main/java/com/zc/business/service/IDcEventImportantFileService.java

@@ -1,6 +1,8 @@
 package com.zc.business.service;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.zc.business.domain.DcEventImportantFile;
 
 /**
@@ -58,4 +60,12 @@ public interface IDcEventImportantFileService
      * @return 结果
      */
     int deleteDcEventImportantFileByEventId(String id);
+
+    /**
+     * 获取重要事件状态
+     *
+     * @param eventId 事件id
+     * @return 结果
+     */
+    AjaxResult getImportantFileStatus(String eventId);
 }

zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java

@@ -467,5 +467,10 @@ public class DcDeviceServiceImpl extends ServiceImpl<DcDeviceMapper, DcDevice> i
         }
         return null;
     }
+
+    @Override
+    public List<DcDevice> selectNearCamPile(String direction,String startMileage,String endMileage){
+        return dcDeviceMapper.selectNearCamPile(direction,startMileage,endMileage);
+    }
 }
 

zc-business/src/main/java/com/zc/business/service/impl/DcEventImportantFileServiceImpl.java

@@ -2,6 +2,8 @@ package com.zc.business.service.impl;
 
 import java.util.Date;
 import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.zc.business.domain.DcEventProcess;
@@ -109,7 +111,7 @@ public class DcEventImportantFileServiceImpl implements IDcEventImportantFileSer
     /**
      * 删除重要事件文件内容信息
      *
-     * @param eventId 重要事件文件内容主键
+     * @param id 重要事件文件内容主键
      * @return 结果
      */
     @Override
@@ -117,4 +119,17 @@ public class DcEventImportantFileServiceImpl implements IDcEventImportantFileSer
     {
         return dcEventImportantFileMapper.deleteDcEventImportantFileByEventId(id);
     }
+
+    /**
+     * 获取重要事件状态
+     *
+     * @param eventId 事件id
+     * @return 结果
+     */
+    @Override
+    public AjaxResult getImportantFileStatus(String eventId){
+        int num = dcEventImportantFileMapper.getImportantFileStatus(eventId);
+        return AjaxResult.success(num);
+    }
+
 }

zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml

@@ -118,4 +118,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY device_type, child_type;
     </select>
 
+    <select id="selectNearCamPile" resultMap="DcDevice">
+        select t1.id, t1.iot_device_id, t1.group_id, t1.product_id, t1.stake_mark, t1.direction, t1.device_name,
+            t1.device_code, t1.device_type,t1.installation_Date,t1.production_date,t1.durable_years,t1.installation_site,
+            t1.use_state,t1.device_state,t1.other_config,t1.remark,t1.create_time,t1.update_time,t1.facilities_type,
+            t1.device_ip,t1.stake_mark_range,t1.device_img,t1.child_type,t1.facilities_type,t2.longitude,t2.latitude
+        from dc_device t1
+        left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark and t1.direction = t2.direction
+        where  !ISNULL(t1.iot_device_id) and t1.device_type = '1' and t1.direction = #{direction}
+            and t2.mileage >= #{startMileage} and t2.mileage &lt;= #{endMileage}
+    </select>
+
 </mapper>

zc-business/src/main/resources/mapper/business/DcEventImportantFileMapper.xml

@@ -41,7 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDcEventImportantFileVo"/>
         where id = #{id}
     </select>
-        
+    <select id="getImportantFileStatus" resultType="java.lang.Integer">
+        SELECT IFNULL(max(type),0) type
+        FROM `dc_event_important_file`
+        where event_id = #{eventId}
+    </select>
+
     <insert id="insertDcEventImportantFile" parameterType="DcEventImportantFile" useGeneratedKeys="true" keyProperty="id">
         insert into dc_event_important_file
         <trim prefix="(" suffix=")" suffixOverrides=",">